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

More v2.2

Browse Source
This commit is contained in:
Gunnar Skjold
2022-11-25 19:18:32 +01:00
parent d4d9d2224f
commit 2dcc874592
47 changed files with 2205 additions and 746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/EnergyAccounting/src/EnergyAccounting.cpp
View File

@@ -261,8 +261,8 @@ float EnergyAccounting::getMonthMax() {
return maxHour > 0 ? maxHour / count / 100.0 : 0.0;
}
float EnergyAccounting::getPeak(uint8_t num) {
if(num < 1 || num > 5) return 0.0;
EnergyAccountingPeak EnergyAccounting::getPeak(uint8_t num) {
if(num < 1 || num > 5) return EnergyAccountingPeak({0,0});
uint8_t count = 0;
bool included[5] = { false, false, false, false, false };
@@ -288,10 +288,10 @@ float EnergyAccounting::getPeak(uint8_t num) {
if(!included[i]) continue;
pos++;
if(pos == num) {
return data.peaks[i].value / 100.0;
return data.peaks[i];
}
}
return 0.0;
return EnergyAccountingPeak({0,0});
}
bool EnergyAccounting::load() {