patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make BateryStats::updateAvailable wrap-around-safe

Browse Source
This commit is contained in:
Bernhard Kirchen 2024-03-04 22:18:43 +01:00 committed by Bernhard Kirchen
parent fe7e622e2d
commit e432f0eca3
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/BatteryStats.h
View File

@ -15,7 +15,7 @@ class BatteryStats {
// the last time *any* datum was updated // the last time *any* datum was updated
uint32_t getAgeSeconds() const { return (millis() - _lastUpdate) / 1000; } uint32_t getAgeSeconds() const { return (millis() - _lastUpdate) / 1000; }
bool updateAvailable(uint32_t since) const { return _lastUpdate > since; } bool updateAvailable(uint32_t since) const;
uint8_t getSoC() const { return _soc; } uint8_t getSoC() const { return _soc; }
uint32_t getSoCAgeSeconds() const { return (millis() - _lastUpdateSoC) / 1000; } uint32_t getSoCAgeSeconds() const { return (millis() - _lastUpdateSoC) / 1000; }

6
src/BatteryStats.cpp
View File

@ -51,6 +51,12 @@ static void addLiveViewAlarm(JsonVariant& root, std::string const& name,
root["issues"][name] = 2; root["issues"][name] = 2;
} }
bool BatteryStats::updateAvailable(uint32_t since) const
{
auto constexpr halfOfAllMillis = std::numeric_limits<uint32_t>::max() / 2;
return (_lastUpdate - since) < halfOfAllMillis;
}
void BatteryStats::getLiveViewData(JsonVariant& root) const void BatteryStats::getLiveViewData(JsonVariant& root) const
{ {
root[F("manufacturer")] = _manufacturer; root[F("manufacturer")] = _manufacturer;