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 3bbe8917..0097c9c7 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 @@ -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)); if ((tipTemp > 55) || tipDisconnected) { - // draw temp over the start soldering button - // Location changes on screen rotation and due to button swapping - // 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::setCursor(isReverse ? (isFlipped ? 27 : 59) : (isFlipped ? 56 : 0), 0); - // If tip is disconnected draw the notification, otherwise - the temp - if (tipDisconnected) { - // Draw-in the missing tip symbol - if (isReverse) { - OLED::drawArea(isFlipped ? 20 : 54, 0, 56, 32, isFlipped ? disconnectedTipF : disconnectedTip); - } else { - OLED::drawArea(isFlipped ? 54 : 0, 0, 56, 32, isFlipped ? disconnectedTipF : disconnectedTip); - } - } else if (!(getSettingValue(SettingsOptions::CoolingTempBlink) && (xTaskGetTickCount() % 1000 < 300))) { - ui_draw_tip_temperature(false, FontStyle::LARGE); // Draw-in the temp - } + // draw temp over the start soldering button + // Location changes on screen rotation and due to button swapping + // 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::setCursor(isReverse ? (isFlipped ? 27 : 59) : (isFlipped ? 56 : 0), 0); + // If tip is disconnected draw the notification, otherwise - the temp + if (tipDisconnected) { + // Draw-in the missing tip symbol + if (isReverse) { + OLED::drawArea(isFlipped ? 20 : 54, 0, 56, 32, isFlipped ? disconnectedTipF : disconnectedTip); + } else { + OLED::drawArea(isFlipped ? 54 : 0, 0, 56, 32, isFlipped ? disconnectedTipF : disconnectedTip); + } + } else if (!(getSettingValue(SettingsOptions::CoolingTempBlink) && (xTaskGetTickCount() % 1000 < 300))) { + ui_draw_tip_temperature(false, FontStyle::LARGE); // Draw-in the temp + } } OLED::setCursor(isFlipped ? 0 : 116, 0); ui_draw_power_source_icon(); 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 3f9540d9..8e128d88 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 @@ -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)); if ((tipTemp > 55) || tipDisconnected) { - // draw temp over the start soldering button - // Location changes on screen rotation and due to button swapping - // 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::setCursor(isReverse ? (isFlipped ? 15 : 43) : (isFlipped ? 56 : 0), 0); - // If tip is disconnected draw the notification, otherwise - the temp - if (tipDisconnected) { - // Draw-in the missing tip symbol - if (isReverse) { - OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? disconnectedTipF : disconnectedTip); - } else { - 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 - } + // draw temp over the start soldering button + // Location changes on screen rotation and due to button swapping + // 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::setCursor(isReverse ? (isFlipped ? 15 : 43) : (isFlipped ? 56 : 0), 0); + // If tip is disconnected draw the notification, otherwise - the temp + if (tipDisconnected) { + // Draw-in the missing tip symbol + if (isReverse) { + OLED::drawArea(isFlipped ? 12 : 42, 0, 42, 16, isFlipped ? disconnectedTipF : disconnectedTip); + } else { + 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 + } } OLED::setCursor(isFlipped ? 0 : 84, 0); ui_draw_power_source_icon();