3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-06-11 23:21:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

0.8.1030012

Browse source
This commit is contained in:
Patrick Amrhein 2024-05-10 18:47:30 +02:00
parent e25045dbd9
commit 75687a78db
7 changed files with 158 additions and 289 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/plugins/zeroExport/zeroExport.h
View file

@ -166,45 +166,10 @@ class ZeroExport {
// Regelgröße x in Watt
int16_t x = 0.0;
int16_t xSum = 0.0;
switch (CfgGroupInv->target) {
case zeroExportInverterTarget_t::Sum:
x = mPowermeter.getDataAVG(group).P;
break;
case zeroExportInverterTarget_t::L1:
x = mPowermeter.getDataAVG(group).P1;
break;
case zeroExportInverterTarget_t::L2:
x = mPowermeter.getDataAVG(group).P2;
break;
case zeroExportInverterTarget_t::L3:
x = mPowermeter.getDataAVG(group).P3;
break;
case zeroExportInverterTarget_t::L1Sum:
x = mPowermeter.getDataAVG(group).P1;
xSum = mPowermeter.getDataAVG(group).P;
xSum -= mPowermeter.getDataAVG(group).P2;
xSum -= mPowermeter.getDataAVG(group).P3;
if (xSum > x) x = xSum;
break;
case zeroExportInverterTarget_t::L2Sum:
x = mPowermeter.getDataAVG(group).P2;
xSum = mPowermeter.getDataAVG(group).P;
xSum -= mPowermeter.getDataAVG(group).P1;
xSum -= mPowermeter.getDataAVG(group).P3;
if (xSum > x) x = xSum;
break;
case zeroExportInverterTarget_t::L3Sum:
x = mPowermeter.getDataAVG(group).P3;
xSum = mPowermeter.getDataAVG(group).P;
xSum -= mPowermeter.getDataAVG(group).P1;
xSum -= mPowermeter.getDataAVG(group).P2;
if (xSum > x) x = xSum;
break;
default:
x = w;
// TODO: ErrorLog
break;
if (CfgGroup->minimum) {
x = mPowermeter.getDataMIN(group);
} else {
x = mPowermeter.getDataAVG(group);
}
mLog["x"] = x;