github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-26 12:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev-v2.2

Browse Source
This commit is contained in:
Gunnar Skjold
2022-11-01 19:07:00 +01:00
parent 92692c6eaf 775e5a0881
commit 65a09dcecf
19 changed files with 818 additions and 741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -237,7 +237,7 @@ float EnergyAccounting::getMonthMax() {
uint32_t maxHour = 0.0;
bool included[5] = { false, false, false, false, false };
while(count < config->hours && count <= 5) {
for(uint8_t x = 0;x < min((uint8_t) 5, config->hours); x++) {
uint8_t maxIdx = 0;
uint16_t maxVal = 0;
for(uint8_t i = 0; i < 5; i++) {
@@ -248,8 +248,10 @@ float EnergyAccounting::getMonthMax() {
maxIdx = i;
}
}
included[maxIdx] = true;
count++;
if(maxVal > 0) {
included[maxIdx] = true;
count++;
}
}
for(uint8_t i = 0; i < 5; i++) {
@@ -265,7 +267,7 @@ float EnergyAccounting::getPeak(uint8_t num) {
uint8_t count = 0;
bool included[5] = { false, false, false, false, false };
while(count < config->hours && count <= 5) {
for(uint8_t x = 0;x < min((uint8_t) 5, config->hours); x++) {
uint8_t maxIdx = 0;
uint16_t maxVal = 0;
for(uint8_t i = 0; i < 5; i++) {
@@ -275,8 +277,10 @@ float EnergyAccounting::getPeak(uint8_t num) {
maxIdx = i;
}
}
included[maxIdx] = true;
count++;
if(maxVal > 0) {
included[maxIdx] = true;
count++;
}
}
uint8_t pos = 0;