Drop decimal when > 99.9W

This commit is contained in:
Ben V. Brown
2023-01-23 17:49:40 +11:00
parent 7ede4d2d44
commit c2d69f91a6

View File

@@ -127,10 +127,20 @@ void gui_solderingMode(uint8_t jumpToSleep) {
} else { } else {
OLED::setCursor(67, 0); OLED::setCursor(67, 0);
} }
OLED::printNumber(x10WattHistory.average() / 10, 2, FontStyle::SMALL); // Print wattage
OLED::print(SmallSymbolDot, FontStyle::SMALL); {
OLED::printNumber(x10WattHistory.average() % 10, 1, FontStyle::SMALL); uint32_t x10Watt = x10WattHistory.average();
OLED::print(SmallSymbolWatts, FontStyle::SMALL); if (x10Watt > 999) { // If we exceed 99.9W we drop the decimal place to keep it all fitting
OLED::print(SmallSymbolSpace, FontStyle::SMALL);
OLED::printNumber(x10WattHistory.average() / 10, 3, FontStyle::SMALL);
OLED::print(SmallSymbolWatts, FontStyle::SMALL);
} else {
OLED::printNumber(x10WattHistory.average() / 10, 2, FontStyle::SMALL);
OLED::print(SmallSymbolDot, FontStyle::SMALL);
OLED::printNumber(x10WattHistory.average() % 10, 1, FontStyle::SMALL);
OLED::print(SmallSymbolWatts, FontStyle::SMALL);
}
}
if (OLED::getRotation()) { if (OLED::getRotation()) {
OLED::setCursor(0, 8); OLED::setCursor(0, 8);