Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

some EnergyMeter fixes #583

Merged
merged 5 commits into from
Mar 31, 2023
Merged

some EnergyMeter fixes #583

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
064bd5a
fix montly energy meter
KipK Mar 29, 2023
28b4928
fix session_elapsed beeing reset at reboot
KipK Mar 29, 2023
cd7ae6d
fix energyMeter time calculation
KipK Mar 30, 2023
ed11d59
add missing publish when resetting counter
KipK Mar 30, 2023
5f6a293
fix weekly again ( now ok )
KipK Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 25 additions & 37 deletions src/energy_meter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ void EnergyMeterData::deserialize(StaticJsonDocument<capacity> &doc)
// daily
daily = doc["dy"];
}
if (doc.containsKey("we") && doc["we"].is<double>())
if (doc.containsKey("wk") && doc["wk"].is<double>())
{
// weekly
daily = doc["we"];
weekly = doc["wk"];
}
if (doc.containsKey("mo") && doc["mo"].is<double>())
{
Expand Down Expand Up @@ -154,21 +154,6 @@ void EnergyMeter::begin(EvseMonitor *monitor)
_write_upd = _last_upd;
_event_upd = _last_upd;
_rotate_upd = _last_upd;
if (_data.elapsed > 0)
{
if (_monitor->isVehicleConnected())
{
// restoring session, wifi module has probably rebooted
_elapsed = _data.elapsed * 1000;
}
else
{
_data.elapsed = 0;
_elapsed = 0;
_data.session = 0;
save();
}
}

// if total is 0, try to load old OpenEvse module counter
if (!_data.total && !_data.imported)
Expand Down Expand Up @@ -211,6 +196,7 @@ void EnergyMeter::end()
bool EnergyMeter::reset(bool full = false, bool import = false)
{
if (createEnergyMeterStorage(full, import)) {
publish();
return true;
}
else
Expand All @@ -221,7 +207,6 @@ void EnergyMeter::clearSession()
{
_data.session = 0;
_data.elapsed = 0;
_elapsed = 0;
save();
DBUGLN("Energy Meter: clearing session");
publish();
Expand All @@ -240,8 +225,7 @@ bool EnergyMeter::update()
uint32_t dms = curms - _last_upd;

// increment elapsed time
_elapsed += dms;
_data.elapsed = _elapsed / 1000U;
_data.elapsed += dms / 1000U;

// if (dms >= MAX_INTERVAL) {
DBUGLN("Energy Meter: Incrementing");
Expand Down Expand Up @@ -286,13 +270,13 @@ bool EnergyMeter::update()
// convert to w/h
double wh = mws / 3600000UL;
_data.session += wh;
_data.total += wh / 1000;
double kwh = wh / 1000UL;
_data.total += kwh;
DBUGVAR(_data.session);

_data.daily += wh / 1000;
_data.weekly += wh / 1000;
_data.monthly += wh / 1000;
_data.yearly += wh / 1000;
_data.daily += kwh;
_data.weekly += kwh;
_data.monthly += kwh;
_data.yearly += kwh;

_last_upd = curms;
DBUGF("session_wh = %.2f, total_kwh = %.2f", _data.session, _data.total);
Expand Down Expand Up @@ -375,10 +359,6 @@ void EnergyMeter::rotate()
save();
publish();
}
if (!_monitor->isVehicleConnected() && _data.elapsed)
{
_data.elapsed = 0;
}
};

bool EnergyMeter::load()
Expand Down Expand Up @@ -485,13 +465,21 @@ bool EnergyMeter::createEnergyMeterStorage(bool fullreset = false, bool forceimp
EnergyMeterDate EnergyMeter::getCurrentDate()
{
EnergyMeterDate date;
struct timeval local_time;
gettimeofday(&local_time, NULL);
tm *timeinfo = gmtime(&local_time.tv_sec);
uint16_t yday = (uint16_t)timeinfo->tm_yday;
date.day = (uint8_t)timeinfo->tm_wday;
date.month = (uint8_t)timeinfo->tm_mon;
date.year = 1900 + (uint16_t)timeinfo->tm_year;

// get the current time
char offset[8];
char local_time[64];
struct timeval time_now;
gettimeofday(&time_now, NULL);

struct tm timeinfo;
localtime_r(&time_now.tv_sec, &timeinfo);
strftime(local_time, sizeof(local_time), "%FT%T%z", &timeinfo);

uint16_t yday = (uint16_t)timeinfo.tm_yday;
date.day = (uint8_t)timeinfo.tm_wday;
date.month = (uint8_t)timeinfo.tm_mon;
date.year = 1900 + (uint16_t)timeinfo.tm_year;

return date;
};
Expand Down