github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-03-30 11:44:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve graph calculation stability

Browse Source
This commit is contained in:
Gunnar Skjold
2022-02-12 11:12:48 +01:00
parent ef0041caa6
commit 0c1d666afd
5 changed files with 133 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/EnergyAccounting.cpp
View File

@@ -1,6 +1,7 @@
#include "EnergyAccounting.h"
#include "LittleFS.h"
#include "AmsStorage.h"
#include "version.h"
EnergyAccounting::EnergyAccounting(RemoteDebug* debugger) {
data.version = 1;
@@ -24,7 +25,7 @@ void EnergyAccounting::setTimezone(Timezone* tz) {
bool EnergyAccounting::update(AmsData* amsData) {
time_t now = time(nullptr);
if(now < EPOCH_2021_01_01) return false;
if(now < BUILD_EPOCH) return false;
if(tz == NULL) {
if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting) Timezone is missing\n");
return false;
@@ -154,7 +155,7 @@ double EnergyAccounting::getCostThisHour() {
double EnergyAccounting::getUseToday() {
float ret = 0.0;
time_t now = time(nullptr);
if(now < EPOCH_2021_01_01) return 0;
if(now < BUILD_EPOCH) return 0;
tmElements_t local, utc;
breakTime(tz->toLocal(now), local);
for(int i = 0; i < local.Hour; i++) {
@@ -174,7 +175,7 @@ double EnergyAccounting::getCostYesterday() {
double EnergyAccounting::getUseThisMonth() {
time_t now = time(nullptr);
if(now < EPOCH_2021_01_01) return 0;
if(now < BUILD_EPOCH) return 0;
tmElements_t tm;
if(tz != NULL)
breakTime(tz->toLocal(now), tm);