ETM-Schurig/etm-powersync-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #694: Fronius: Fix PV power if there are multiple inverters

Browse Source
This commit is contained in:
jenkins 2023-05-16 12:59:24 +02:00
commit e5d517b7bd
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fronius/integrationpluginfronius.cpp
View File

@ -55,7 +55,7 @@ void IntegrationPluginFronius::discoverThings(ThingDiscoveryInfo *info)
return; return;
} }
qCDebug(dcFronius()) << "Starting network discovery..."; qCInfo(dcFronius()) << "Starting network discovery...";
NetworkDeviceDiscoveryReply *discoveryReply = hardwareManager()->networkDeviceDiscovery()->discover(); NetworkDeviceDiscoveryReply *discoveryReply = hardwareManager()->networkDeviceDiscovery()->discover();
connect(discoveryReply, &NetworkDeviceDiscoveryReply::finished, discoveryReply, &NetworkDeviceDiscoveryReply::deleteLater); connect(discoveryReply, &NetworkDeviceDiscoveryReply::finished, discoveryReply, &NetworkDeviceDiscoveryReply::deleteLater);
connect(discoveryReply, &NetworkDeviceDiscoveryReply::finished, info, [=](){ connect(discoveryReply, &NetworkDeviceDiscoveryReply::finished, info, [=](){
@ -448,18 +448,29 @@ void IntegrationPluginFronius::updatePowerFlow(FroniusSolarConnection *connectio
// Parse the data and update the states of our device // Parse the data and update the states of our device
QVariantMap dataMap = jsonDoc.toVariant().toMap().value("Body").toMap().value("Data").toMap(); QVariantMap dataMap = jsonDoc.toVariant().toMap().value("Body").toMap().value("Data").toMap();
//qCDebug(dcFronius()) << "Power flow data" << qUtf8Printable(QJsonDocument::fromVariant(dataMap).toJson(QJsonDocument::Indented)); qCDebug(dcFronius()) << "Power flow data" << qUtf8Printable(QJsonDocument::fromVariant(dataMap).toJson(QJsonDocument::Indented));
// Find the inverter for this connection and set the total power
Things availableInverters = myThings().filterByParentId(parentThing->id()).filterByThingClassId(inverterThingClassId); Things availableInverters = myThings().filterByParentId(parentThing->id()).filterByThingClassId(inverterThingClassId);
if (availableInverters.count() == 1) { if (availableInverters.count() > 0) {
Thing *inverterThing = availableInverters.first(); if (availableInverters.count() == 1) {
double pvPower = dataMap.value("Site").toMap().value("P_PV").toDouble(); // Note: this is the actual power if there is a storage (the inverter object returns the energy before DC convertion fpor the storage
inverterThing->setStateValue(inverterCurrentPowerStateTypeId, - pvPower); Thing *inverterThing = availableInverters.first();
double pvPower = dataMap.value("Site").toMap().value("P_PV").toDouble();
inverterThing->setStateValue(inverterCurrentPowerStateTypeId, - pvPower);
} else {
// Let's set the individual PV values
foreach (Thing *inverterThing, availableInverters) {
QVariantMap inverterMap = dataMap.value("Inverters").toMap().value(QString::number(inverterThing->paramValue(inverterThingIdParamTypeId).toInt())).toMap();
if (!inverterMap.isEmpty()) {
double inverterPower = inverterMap.value("P").toDouble();
inverterThing->setStateValue(inverterCurrentPowerStateTypeId, -inverterPower);
}
}
}
} }
// Find the storage for this connection and update the current power // Find the storage for this connection and update the current power
Things availableStorages = myThings().filterByParentId(parentThing->id()).filterByThingClassId(storageThingClassId); Things availableStorages = myThings().filterByParentId(parentThing->id()).filterByThingClassId(storageThingClassId);
// TODO: check what to set if there are more than one battery connected
if (availableStorages.count() == 1) { if (availableStorages.count() == 1) {
Thing *storageThing = availableStorages.first(); Thing *storageThing = availableStorages.first();
// Note: negative (charge), positiv (discharge) // Note: negative (charge), positiv (discharge)