FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trip odometer run time

This commit is contained in:
Matthew Kennedy 2023-10-02 22:14:03 -07:00
parent b698cc82fe
commit 768637aff1
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/controllers/algo/trip_odometer.cpp
View File

@ -45,6 +45,18 @@ void TripOdometer::onSlowCallback() {
m_distanceMeters++;
m_distanceRemainder--;
}
constexpr float slowCallbackPerSecond = 1000 / SLOW_CALLBACK_PERIOD_MS;
m_slowCallbackCounter++;
if (m_slowCallbackCounter == slowCallbackPerSecond) {
m_slowCallbackCounter = 0;
m_ignitionOnSeconds++;
if (engine->rpmCalculator.isRunning()) {
m_engineRunningSeconds++;
}
}
}
uint32_t TripOdometer::getDistanceMeters() const {

7
firmware/controllers/algo/trip_odometer.h
View File

@ -12,12 +12,19 @@ public:
uint32_t getDistanceMeters() const;
private:
// Fuel consumed
uint32_t m_consumedGrams = 0;
float m_consumedRemainder = 0;
float m_rate = 0;
// Distance travelled
uint32_t m_distanceMeters = 0;
float m_distanceRemainder = 0;
// Engine run time and ign on time
uint32_t m_slowCallbackCounter = 0;
uint32_t m_ignitionOnSeconds = 0;
uint32_t m_engineRunningSeconds = 0;
Timer m_timer;
};