3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-05-07 14:15:53 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix 1ch AC calc

Browse source
This commit is contained in:
rejoe2 2023-10-19 17:55:57 +02:00 • committed by GitHub
parent 0fca99f833
commit ae49f91966
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/hm/Communication.h
View file

@ -579,10 +579,15 @@ const byteAssign_t InfoAssignment[] = {
//preliminary AC calculation...
float ac_pow = 0;
for(uint8_t i = 1; i <= iv->channels; i++) {
if ((!iv->lastAlarm[i].code) || (iv->lastAlarm[i].code == 1)) {
uint8_t pos = iv->getPosByChFld(i, FLD_PDC, rec);
ac_pow += iv->getValue(pos, rec);
if (iv->type == INV_TYPE_1CH) {
if ((!iv->lastAlarm[0].code) || (iv->lastAlarm[0].code == 1))
ac_pow += iv->getValue(iv->getPosByChFld(1, FLD_PDC, rec), rec);
} else {
for(uint8_t i = 1; i <= iv->channels; i++) {
if ((!iv->lastAlarm[i].code) || (iv->lastAlarm[i].code == 1)) {
uint8_t pos = iv->getPosByChFld(i, FLD_PDC, rec);
ac_pow += iv->getValue(pos, rec);
}
}
}
ac_pow = (int) (ac_pow*9.5);