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

Merge pull request #237 from bobbycar-graz/more-statistics

Browse Source
This commit is contained in:
CommanderRedYT
2022-01-26 18:19:42 +01:00
committed by GitHub
parent 40918ec32a b27cf645e6
commit 4d61959c5b
3 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main/displays/menus/statisticsmenu.cpp
View File

@@ -126,6 +126,18 @@ class EfficiencyText : public virtual espgui::TextInterface {
} }
}; };
class AverageSpeedKmhOverTime : public virtual espgui::TextInterface {
public: std::string text() const override {
return fmt::format("Avg speed: {:.1f} km/h", getAvgKmh());
}
};
class EstimatedKmLeft : public virtual espgui::TextInterface {
public: std::string text() const override {
return fmt::format("est km:{}", getRemainingEstimateRangeString());
}
};
class EfficiencyTextColor : public virtual espgui::ColorInterface { class EfficiencyTextColor : public virtual espgui::ColorInterface {
public: public:
int color() const override int color() const override
@@ -165,11 +177,13 @@ StatisticsMenu::StatisticsMenu()
constructMenuItem<makeComponent<MenuItem, CurrentKilometersText, DummyAction>>(); constructMenuItem<makeComponent<MenuItem, CurrentKilometersText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, CurrentDrivingTimeText, DummyAction>>(); constructMenuItem<makeComponent<MenuItem, CurrentDrivingTimeText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, TotalKilometersText, DummyAction>>(); constructMenuItem<makeComponent<MenuItem, TotalKilometersText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, TotalMetersText, DummyAction>>();
// constructMenuItem<makeComponent<MenuItem, SavedTotalCentimetersText, DummyAction>>(); // constructMenuItem<makeComponent<MenuItem, SavedTotalCentimetersText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, CurrentWhUsedText, DummyAction>>(); constructMenuItem<makeComponent<MenuItem, CurrentWhUsedText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, AverageWhUsedText, DummyAction>>(); constructMenuItem<makeComponent<MenuItem, AverageWhUsedText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, AverageSpeedKmhOverTime, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, EstimatedKmLeft, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, EfficiencyText, EfficiencyTextColor, DummyAction>>(); constructMenuItem<makeComponent<MenuItem, EfficiencyText, EfficiencyTextColor, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, TotalMetersText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, EmptyText, DummyAction>>(); constructMenuItem<makeComponent<MenuItem, EmptyText, DummyAction>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_STATSSAVE>, SaveKilometersAction, StaticMenuItemIcon<&bobbyicons::update>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_STATSSAVE>, SaveKilometersAction, StaticMenuItemIcon<&bobbyicons::update>>>();
constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_STATSCLEAR>, ClearCurrentStatsAction, StaticMenuItemIcon<&bobbyicons::reboot>>>(); constructMenuItem<makeComponent<MenuItem, StaticText<TEXT_STATSCLEAR>, ClearCurrentStatsAction, StaticMenuItemIcon<&bobbyicons::reboot>>>();

16
main/drivingstatistics.cpp
View File

@@ -19,6 +19,16 @@ float getAvgWhPerKm()
return drivingStatistics.wh_used / (drivingStatistics.meters_driven / 1000.f); return drivingStatistics.wh_used / (drivingStatistics.meters_driven / 1000.f);
} }
float getAvgKmh()
{
return (drivingStatistics.meters_driven / 1000.) / (drivingStatistics.currentDrivingTime.count() / 1000 / 60 / 60); // (meter / 1000) / (ms / 1000 / 60 / 60)
}
float getEstimatedKmLeft()
{
return (getRemainingWattHours() / getAvgWhPerKm());
}
std::string getEfficiencyClassString() std::string getEfficiencyClassString()
{ {
const float avgWhPerKm = getAvgWhPerKm(); const float avgWhPerKm = getAvgWhPerKm();
@@ -49,6 +59,12 @@ uint16_t getEfficiencyClassColor()
else return 0xF800; else return 0xF800;
} }
std::string getRemainingEstimateRangeString()
{
return fmt::format("{:.1f} km", getEstimatedKmLeft());
}
void initStatistics() void initStatistics()
{ {

3
main/drivingstatistics.h
View File

@@ -19,5 +19,8 @@ extern DrivingStatistics drivingStatistics;
void initStatistics(); void initStatistics();
void calculateStatistics(); void calculateStatistics();
float getAvgWhPerKm(); float getAvgWhPerKm();
float getAvgKmh();
float getEstimatedKmLeft();
std::string getEfficiencyClassString(); std::string getEfficiencyClassString();
std::string getRemainingEstimateRangeString();
uint16_t getEfficiencyClassColor(); uint16_t getEfficiencyClassColor();