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

Style correction (8th TRY)

Browse Source
This commit is contained in:
Leo
2025-01-29 06:28:14 +02:00
parent 54d14b421c
commit 8908c9d687
2 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/Core/Threads/UI/drawing/mono_128x32/draw_homescreen_simplified.cpp
View File

@@ -15,22 +15,22 @@ void ui_draw_homescreen_simplified(TemperatureType_t tipTemp) {
OLED::drawArea(isFlipped ? 12 : 58, 0, 56, 32, isFlipped ? (isReverse ? buttonAF : buttonBF) : (isReverse ? buttonA : buttonB)); OLED::drawArea(isFlipped ? 12 : 58, 0, 56, 32, isFlipped ? (isReverse ? buttonAF : buttonBF) : (isReverse ? buttonA : buttonB));
if ((tipTemp > 55) || tipDisconnected) { if ((tipTemp > 55) || tipDisconnected) {
// draw temp over the start soldering button // draw temp over the start soldering button
// Location changes on screen rotation and due to button swapping // Location changes on screen rotation and due to button swapping
// in right handed mode we want to draw over the first part // in right handed mode we want to draw over the first part
OLED::fillArea(isReverse ? (isFlipped ? 26 : 58) : (isFlipped ? 68 : 0), 0, 56, 32, 0); // clear the area OLED::fillArea(isReverse ? (isFlipped ? 26 : 58) : (isFlipped ? 68 : 0), 0, 56, 32, 0); // clear the area
OLED::setCursor(isReverse ? (isFlipped ? 27 : 59) : (isFlipped ? 56 : 0), 0); OLED::setCursor(isReverse ? (isFlipped ? 27 : 59) : (isFlipped ? 56 : 0), 0);
// If tip is disconnected draw the notification, otherwise - the temp // If tip is disconnected draw the notification, otherwise - the temp
if (tipDisconnected) { if (tipDisconnected) {
// Draw-in the missing tip symbol // Draw-in the missing tip symbol
if (isReverse) { if (isReverse) {
OLED::drawArea(isFlipped ? 20 : 54, 0, 56, 32, isFlipped ? disconnectedTipF : disconnectedTip); OLED::drawArea(isFlipped ? 20 : 54, 0, 56, 32, isFlipped ? disconnectedTipF : disconnectedTip);
} else { } else {
OLED::drawArea(isFlipped ? 54 : 0, 0, 56, 32, isFlipped ? disconnectedTipF : disconnectedTip); OLED::drawArea(isFlipped ? 54 : 0, 0, 56, 32, isFlipped ? disconnectedTipF : disconnectedTip);
} }
} else if (!(getSettingValue(SettingsOptions::CoolingTempBlink) && (xTaskGetTickCount() % 1000 < 300))) { } 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 : 116, 0); OLED::setCursor(isFlipped ? 0 : 116, 0);
ui_draw_power_source_icon(); ui_draw_power_source_icon();

32
source/Core/Threads/UI/drawing/mono_96x16/draw_homescreen_simplified.cpp
View File

@@ -14,22 +14,22 @@ void ui_draw_homescreen_simplified(TemperatureType_t tipTemp) {
OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? (isReverse ? buttonAF : buttonBF) : (isReverse ? buttonA : buttonB)); OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? (isReverse ? buttonAF : buttonBF) : (isReverse ? buttonA : buttonB));
if ((tipTemp > 55) || tipDisconnected) { if ((tipTemp > 55) || tipDisconnected) {
// draw temp over the start soldering button // draw temp over the start soldering button
// Location changes on screen rotation and due to button swapping // Location changes on screen rotation and due to button swapping
// in right handed mode we want to draw over the first part // in right handed mode we want to draw over the first part
OLED::fillArea(isReverse ? (isFlipped ? 14 : 42) : (isFlipped ? 55 : 0), 0, 41, 16, 0); // clear the area OLED::fillArea(isReverse ? (isFlipped ? 14 : 42) : (isFlipped ? 55 : 0), 0, 41, 16, 0); // clear the area
OLED::setCursor(isReverse ? (isFlipped ? 15 : 43) : (isFlipped ? 56 : 0), 0); OLED::setCursor(isReverse ? (isFlipped ? 15 : 43) : (isFlipped ? 56 : 0), 0);
// If tip is disconnected draw the notification, otherwise - the temp // If tip is disconnected draw the notification, otherwise - the temp
if (tipDisconnected) { if (tipDisconnected) {
// Draw-in the missing tip symbol // Draw-in the missing tip symbol
if (isReverse) { if (isReverse) {
OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? disconnectedTipF : disconnectedTip); OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? disconnectedTipF : disconnectedTip);
} else { } else {
OLED::drawArea(isFlipped ? 54 : 0, 0, 42, 16, isFlipped ? disconnectedTipF : disconnectedTip); OLED::drawArea(isFlipped ? 54 : 0, 0, 42, 16, isFlipped ? disconnectedTipF : disconnectedTip);
} }
} else if (!(getSettingValue(SettingsOptions::CoolingTempBlink) && (xTaskGetTickCount() % 1000 < 300))) { } 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); OLED::setCursor(isFlipped ? 0 : 84, 0);
ui_draw_power_source_icon(); ui_draw_power_source_icon();