From f882f57b18ef672956b01e81572ef9fb034cc5a8 Mon Sep 17 00:00:00 2001 From: Leo Date: Wed, 29 Jan 2025 06:35:14 +0200 Subject: [PATCH] Style cleanup (9th try!!!) --- .../drawing/mono_128x32/draw_homescreen_simplified.cpp | 8 ++++---- .../drawing/mono_96x16/draw_homescreen_simplified.cpp | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/source/Core/Threads/UI/drawing/mono_128x32/draw_homescreen_simplified.cpp b/source/Core/Threads/UI/drawing/mono_128x32/draw_homescreen_simplified.cpp index 0097c9c7..6528a40c 100644 --- a/source/Core/Threads/UI/drawing/mono_128x32/draw_homescreen_simplified.cpp +++ b/source/Core/Threads/UI/drawing/mono_128x32/draw_homescreen_simplified.cpp @@ -7,13 +7,13 @@ extern uint8_t buttonBF[sizeof(buttonB)]; extern uint8_t disconnectedTipF[sizeof(disconnectedTip)]; void ui_draw_homescreen_simplified(TemperatureType_t tipTemp) { - bool tipDisconnected = isTipDisconnected(); - bool isFlipped = OLED::getRotation(); - bool isReverse = getSettingValue(SettingsOptions::ReverseButtonNavEnabled); + bool tipDisconnected = isTipDisconnected(); + bool isFlipped = OLED::getRotation(); + bool isReverse = getSettingValue(SettingsOptions::ReverseButtonNavEnabled); // Flip and switch buttons accordingly OLED::drawArea(isFlipped ? 68 : 0, 0, 56, 32, isFlipped ? (isReverse ? buttonBF : buttonAF) : (isReverse ? buttonB : buttonA)); OLED::drawArea(isFlipped ? 12 : 58, 0, 56, 32, isFlipped ? (isReverse ? buttonAF : buttonBF) : (isReverse ? buttonA : buttonB)); - + if ((tipTemp > 55) || tipDisconnected) { // draw temp over the start soldering button // Location changes on screen rotation and due to button swapping diff --git a/source/Core/Threads/UI/drawing/mono_96x16/draw_homescreen_simplified.cpp b/source/Core/Threads/UI/drawing/mono_96x16/draw_homescreen_simplified.cpp index 8e128d88..3a720b41 100644 --- a/source/Core/Threads/UI/drawing/mono_96x16/draw_homescreen_simplified.cpp +++ b/source/Core/Threads/UI/drawing/mono_96x16/draw_homescreen_simplified.cpp @@ -6,13 +6,13 @@ extern uint8_t buttonBF[sizeof(buttonB)]; extern uint8_t disconnectedTipF[sizeof(disconnectedTip)]; void ui_draw_homescreen_simplified(TemperatureType_t tipTemp) { - bool tipDisconnected = isTipDisconnected(); - bool isFlipped = OLED::getRotation(); - bool isReverse = getSettingValue(SettingsOptions::ReverseButtonNavEnabled); + bool tipDisconnected = isTipDisconnected(); + bool isFlipped = OLED::getRotation(); + bool isReverse = getSettingValue(SettingsOptions::ReverseButtonNavEnabled); // Flip and switch buttons accordingly OLED::drawArea(isFlipped ? 54 : 0, 0, 42, 16, isFlipped ? (isReverse ? buttonBF : buttonAF) : (isReverse ? buttonB : buttonA)); OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? (isReverse ? buttonAF : buttonBF) : (isReverse ? buttonA : buttonB)); - + if ((tipTemp > 55) || tipDisconnected) { // draw temp over the start soldering button // Location changes on screen rotation and due to button swapping @@ -28,7 +28,7 @@ void ui_draw_homescreen_simplified(TemperatureType_t tipTemp) { OLED::drawArea(isFlipped ? 54 : 0, 0, 42, 16, isFlipped ? disconnectedTipF : disconnectedTip); } } else if (!(getSettingValue(SettingsOptions::CoolingTempBlink) && (xTaskGetTickCount() % 1000 < 300))) { - ui_draw_tip_temperature(false, FontStyle::LARGE); // Draw-in the temp + ui_draw_tip_temperature(false, FontStyle::LARGE); // Draw-in the temp } } OLED::setCursor(isFlipped ? 0 : 84, 0);