Merge branch 'dev' into testing-fix-for-timer-slot-miss

This commit is contained in:
Ben V. Brown
2023-01-30 17:28:03 +11:00
committed by GitHub
37 changed files with 229 additions and 249 deletions

View File

@@ -133,13 +133,12 @@ void gui_solderingMode(uint8_t jumpToSleep) {
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);
}
OLED::print(SmallSymbolWatts, FontStyle::SMALL);
}
if (OLED::getRotation()) {