From 55386b5fb39721e28415d7027f2a248b9edd7131 Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Thu, 23 Jun 2022 20:04:51 +0200 Subject: [PATCH] Fixed formatting --- main/displays/speedinfodisplay.cpp | 34 +++++++++++++++++------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/main/displays/speedinfodisplay.cpp b/main/displays/speedinfodisplay.cpp index 700510d..45d33d9 100644 --- a/main/displays/speedinfodisplay.cpp +++ b/main/displays/speedinfodisplay.cpp @@ -44,13 +44,16 @@ void SpeedInfoDisplay::redraw() tft.setTextSize(1); m_batteryPercentLabel.redraw(getBatteryPercentageString()); - if (const auto avgVoltage = controllers.getAvgVoltage(); avgVoltage) { + if (const auto avgVoltage = controllers.getAvgVoltage(); avgVoltage) + { auto watt = sumCurrent * *avgVoltage; auto wh_per_km = std::abs(avgSpeedKmh) > 0.1 ? watt / std::abs(avgSpeedKmh) : 0; m_voltageLabel.redraw(fmt::format("{:.1f} V", avgVoltage.value())); m_currentConsumptionLabel.redraw(fmt::format("{:.1f} Wh/km", wh_per_km)); - } else { + } + else + { m_voltageLabel.redraw("No voltage"); m_currentConsumptionLabel.redraw("No comsumption"); } @@ -72,21 +75,22 @@ void SpeedInfoDisplay::buttonPressed(espgui::Button button) { Base::buttonPressed(button); - switch (button) { - using espgui::Button; - case Button::Right: - espgui::pushScreen(); - break; - case Button::Up: - espgui::switchScreen(); - break; - case Button::Down: + switch (button) + { + using espgui::Button; + case Button::Right: + espgui::pushScreen(); + break; + case Button::Up: + espgui::switchScreen(); + break; + case Button::Down: #ifdef FEATURE_BMS - espgui::switchScreen(); + espgui::switchScreen(); #else - espgui::switchScreen(); + espgui::switchScreen(); #endif - break; - default:; + break; + default:; } }