feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed labels

Browse Source
This commit is contained in:
CommanderRedYT
2022-01-04 22:11:45 +01:00
parent a0254e36bf
commit dc33a88316
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/displays/menus/batterymenu.cpp
View File

@@ -44,7 +44,7 @@ class WhStatisticsText : public virtual espgui::TextInterface { public: std::str
{ {
if (battery::bootBatWh) if (battery::bootBatWh)
{ {
return fmt::format("&s&1{}Wh => &2{}Wh &6({})", (int)*battery::bootBatWh, (int)getRemainingWattHours(), (int)getRemainingWattHours() - (int)battery::bootBatWh.value()); return fmt::format("&s&2{}Wh => &1{}Wh &6({})", (int)*battery::bootBatWh, (int)getRemainingWattHours(), (int)getRemainingWattHours() - (int)battery::bootBatWh.value());
} }
return ""; return "";
} }
@@ -126,11 +126,11 @@ void BatteryMenu::redraw()
m_doubleProgressBarBatPercentage.redraw(batPercent, *battery::bootBatPercentage); m_doubleProgressBarBatPercentage.redraw(batPercent, *battery::bootBatPercentage);
tft.setTextFont(2); tft.setTextFont(2);
tft.setTextColor(TFT_DARKGREY); tft.setTextColor(TFT_DARKGREY, TFT_BLACK);
m_batPercentNowLabel.redraw(fmt::format("{:.2f} %", batPercent)); m_batPercentNowLabel.redraw(fmt::format("{:.2f} %", batPercent));
m_batPercentBootLabel.redraw(fmt::format("{:.2f} %", *battery::bootBatPercentage)); m_batPercentBootLabel.redraw(fmt::format("{:.2f} %", *battery::bootBatPercentage));
tft.setTextFont(4); tft.setTextFont(4);
tft.setTextColor(TFT_WHITE); tft.setTextColor(TFT_WHITE, TFT_BLACK);
} }
} }

4
main/displays/menus/batterymenu.h
View File

@@ -21,6 +21,6 @@ public:
private: private:
bobbygui::DoubleProgressBar m_doubleProgressBarBatPercentage{75, 68, 90, 24, 0, 100, TFT_RED, TFT_GREEN}; bobbygui::DoubleProgressBar m_doubleProgressBarBatPercentage{75, 68, 90, 24, 0, 100, TFT_RED, TFT_GREEN};
espgui::Label m_batPercentNowLabel {170, 67}; espgui::Label m_batPercentNowLabel {170, 68};
espgui::Label m_batPercentBootLabel{170, 83}; espgui::Label m_batPercentBootLabel{170, 82};
}; };