Update draw_homescreen_simplified.cpp

Is It fOrMaTtEd EnOuGh??
This commit is contained in:
Leo
2025-01-28 15:47:46 +02:00
parent 719dc6b14d
commit 5e5f8581ea

View File

@@ -7,33 +7,33 @@ extern uint8_t disconnectedTipF[sizeof(disconnectedTip)];
void ui_draw_homescreen_simplified(TemperatureType_t tipTemp) { void ui_draw_homescreen_simplified(TemperatureType_t tipTemp) {
bool tipDisconnected = isTipDisconnected(); bool tipDisconnected = isTipDisconnected();
bool displayTemp = (tipTemp > 55) && !tipDisconnected;
bool isFlipped = OLED::getRotation(); bool isFlipped = OLED::getRotation();
bool isReverse = getSettingValue(SettingsOptions::ReverseButtonNavEnabled); bool isReverse = getSettingValue(SettingsOptions::ReverseButtonNavEnabled);
// Flip and switch buttons accordingly // Flip and switch buttons accordingly
OLED::drawArea(isFlipped ? 54 : 0, 0, 42, 16, isFlipped ? (isReverse ? buttonBF : buttonAF) : (isReverse ? buttonB : buttonA)); 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)); OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? (isReverse ? buttonAF : buttonBF) : (isReverse ? buttonA : buttonB));
if (displayTemp || tipDisconnected) { if (((tipTemp > 55) && !tipDisconnected) || tipDisconnected) {
// draw temp over the start soldering button // draw temp over the start soldering button
// Location changes on screen rotation // Location changes on screen rotation
// 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 connected draw the temp, otherwise - the notification // If tip is connected draw the temp, otherwise - the notification
if (!tipDisconnected) { if (!tipDisconnected) {
// Draw-in the temp // Draw-in the temp
if (!(getSettingValue(SettingsOptions::CoolingTempBlink) && (xTaskGetTickCount() % 1000 < 300))) { 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
} }
} else {
// Draw-in the missing tip symbol } else {
if (isReverse) { // Draw-in the missing tip symbol
OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? disconnectedTipF : disconnectedTip); if (isReverse) {
} else { OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? disconnectedTipF : disconnectedTip);
OLED::drawArea(isFlipped ? 54 : 0, 0, 42, 16, isFlipped ? disconnectedTipF : disconnectedTip); } else {
} OLED::drawArea(isFlipped ? 54 : 0, 0, 42, 16, isFlipped ? disconnectedTipF : disconnectedTip);
} }
}
} }
OLED::setCursor(isFlipped ? 0 : 84, 0); OLED::setCursor(isFlipped ? 0 : 84, 0);
ui_draw_power_source_icon(); ui_draw_power_source_icon();