sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Merge pull request #1536 from Ralim/wattage-estimator-rollover

Browse Source 
Drop decimal when > 99.9W
This commit is contained in:
Ben V. Brown
2023-01-24 12:29:58 +11:00
committed by GitHub
parent fcbbe6d924 786d20284e
commit b697647773
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/Core/Threads/OperatingModes/Soldering.cpp
View File

@@ -127,10 +127,20 @@ void gui_solderingMode(uint8_t jumpToSleep) {
} else {
OLED::setCursor(67, 0);
}
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);
// Print wattage
{
uint32_t x10Watt = x10WattHistory.average();
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()) {
OLED::setCursor(0, 8);