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

Merge PR #145: New plugin: Solax

master
jenkins 2023-12-15 10:21:38 +01:00
parent dda8f5f564 6da23c80d6
commit b260c6d428
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
solax/integrationpluginsolax.cpp
View File

@ -251,9 +251,13 @@ void IntegrationPluginSolax::setupThing(ThingSetupInfo *info)
} }
// Update inverter states // Update inverter states
thing->setStateValue(solaxInverterTcpCurrentPowerStateTypeId, -solaxConnection->inverterPower());
thing->setStateValue(solaxInverterTcpCurrentStateTypeId, -solaxConnection->inverterCurrent()); int inverterPower = solaxConnection->powerDc1() + solaxConnection->powerDc1();
thing->setStateValue(solaxInverterTcpCurrentVoltageStateTypeId, solaxConnection->inverterVoltage()); int inverterVoltage = solaxConnection->pvVoltage1() + solaxConnection->pvVoltage2();
int inverterCurrent = solaxConnection->pvCurrent1() + solaxConnection->pvCurrent2();
thing->setStateValue(solaxInverterTcpCurrentPowerStateTypeId, -inverterPower);
thing->setStateValue(solaxInverterTcpCurrentStateTypeId, -inverterCurrent);
thing->setStateValue(solaxInverterTcpCurrentVoltageStateTypeId, inverterVoltage);
thing->setStateValue(solaxInverterTcpTemperatureStateTypeId, solaxConnection->temperature()); thing->setStateValue(solaxInverterTcpTemperatureStateTypeId, solaxConnection->temperature());
thing->setStateValue(solaxInverterTcpFrequencyStateTypeId, solaxConnection->inverterFrequency()); thing->setStateValue(solaxInverterTcpFrequencyStateTypeId, solaxConnection->inverterFrequency());
thing->setStateValue(solaxInverterTcpTotalEnergyProducedStateTypeId, solaxConnection->totalEnergyProduced()); thing->setStateValue(solaxInverterTcpTotalEnergyProducedStateTypeId, solaxConnection->totalEnergyProduced());

1
solax/solax-registers.json
View File

@ -305,7 +305,6 @@
"description": "Battery power (Charge 1)", "description": "Battery power (Charge 1)",
"unit": "W", "unit": "W",
"defaultValue": "0", "defaultValue": "0",
"staticScaleFactor": -1,
"access": "RO" "access": "RO"
}, },
{ {