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

Add phase count calculation and update sessionEnergy to interface

Browse Source
This commit is contained in:
Simon Stürz 2021-10-22 14:45:47 +02:00
parent 1e65edb2a0
commit 0b57fb32e8
2 changed files with 59 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
goecharger/integrationplugingoecharger.cpp
View File

@ -349,7 +349,7 @@ void IntegrationPluginGoECharger::update(Thing *thing, const QVariantMap &status
thing->setStateValue(goeHomeTemperatureSensor4StateTypeId, temperatureSensorList.at(3).toDouble()); thing->setStateValue(goeHomeTemperatureSensor4StateTypeId, temperatureSensorList.at(3).toDouble());
thing->setStateValue(goeHomeTotalEnergyConsumedStateTypeId, statusMap.value("eto").toUInt() / 10.0); thing->setStateValue(goeHomeTotalEnergyConsumedStateTypeId, statusMap.value("eto").toUInt() / 10.0);
thing->setStateValue(goeHomeChargeEnergyStateTypeId, statusMap.value("dws").toUInt() / 360000.0); thing->setStateValue(goeHomeSessionEnergyStateTypeId, statusMap.value("dws").toUInt() / 360000.0);
thing->setStateValue(goeHomePowerStateTypeId, (statusMap.value("alw").toUInt() == 0 ? false : true)); thing->setStateValue(goeHomePowerStateTypeId, (statusMap.value("alw").toUInt() == 0 ? false : true));
thing->setStateValue(goeHomeUpdateAvailableStateTypeId, (statusMap.value("upd").toUInt() == 0 ? false : true)); thing->setStateValue(goeHomeUpdateAvailableStateTypeId, (statusMap.value("upd").toUInt() == 0 ? false : true));
thing->setStateValue(goeHomeCloudStateTypeId, (statusMap.value("cdi").toUInt() == 0 ? false : true)); thing->setStateValue(goeHomeCloudStateTypeId, (statusMap.value("cdi").toUInt() == 0 ? false : true));
@ -371,80 +371,67 @@ void IntegrationPluginGoECharger::update(Thing *thing, const QVariantMap &status
thing->setStateMaxValue(goeHomeMaxChargingCurrentStateTypeId, qMin(amaLimit, cableLimit)); thing->setStateMaxValue(goeHomeMaxChargingCurrentStateTypeId, qMin(amaLimit, cableLimit));
// Parse nrg array // Parse nrg array
uint voltagePhaseA = 0; uint voltagePhaseB = 0; uint voltagePhaseC = 0;
double amperePhaseA = 0; double amperePhaseB = 0; double amperePhaseC = 0;
double currentPower = 0; double powerPhaseA = 0; double powerPhaseB = 0; double powerPhaseC = 0;
QVariantList measurementList = statusMap.value("nrg").toList(); QVariantList measurementList = statusMap.value("nrg").toList();
if (measurementList.count() >= 1) if (measurementList.count() >= 1)
thing->setStateValue(goeHomeVoltagePhaseAStateTypeId, measurementList.at(0).toUInt()); voltagePhaseA = measurementList.at(0).toUInt();
if (measurementList.count() >= 2) if (measurementList.count() >= 2)
thing->setStateValue(goeHomeVoltagePhaseBStateTypeId, measurementList.at(1).toUInt()); voltagePhaseB = measurementList.at(1).toUInt();
if (measurementList.count() >= 3) if (measurementList.count() >= 3)
thing->setStateValue(goeHomeVoltagePhaseCStateTypeId, measurementList.at(2).toUInt()); voltagePhaseC = measurementList.at(2).toUInt();
if (measurementList.count() >= 5) { if (measurementList.count() >= 5)
thing->setStateValue(goeHomeCurrentPhaseAStateTypeId, measurementList.at(4).toUInt() / 10.0); amperePhaseA = measurementList.at(4).toUInt() / 10.0; // 0,1 A value 123 -> 12,3 A
} else {
thing->setStateValue(goeHomeCurrentPhaseAStateTypeId, 0);
thing->setStateValue(goeHomeCurrentPhaseBStateTypeId, 0);
thing->setStateValue(goeHomeCurrentPhaseCStateTypeId, 0);
thing->setStateValue(goeHomeCurrentPowerPhaseAStateTypeId, 0); if (measurementList.count() >= 6)
thing->setStateValue(goeHomeCurrentPowerPhaseBStateTypeId, 0); amperePhaseB = measurementList.at(5).toUInt() / 10.0; // 0,1 A value 123 -> 12,3 A
thing->setStateValue(goeHomeCurrentPowerPhaseCStateTypeId, 0);
thing->setStateValue(goeHomeCurrentPowerStateTypeId, 0);
}
if (measurementList.count() >= 6) { if (measurementList.count() >= 7)
thing->setStateValue(goeHomeCurrentPhaseBStateTypeId, measurementList.at(5).toUInt() / 10.0); amperePhaseC = measurementList.at(6).toUInt() / 10.0; // 0,1 A value 123 -> 12,3 A
} else {
thing->setStateValue(goeHomeCurrentPhaseBStateTypeId, 0);
thing->setStateValue(goeHomeCurrentPhaseCStateTypeId, 0);
thing->setStateValue(goeHomeCurrentPowerPhaseAStateTypeId, 0); if (measurementList.count() >= 8)
thing->setStateValue(goeHomeCurrentPowerPhaseBStateTypeId, 0); powerPhaseA = measurementList.at(7).toUInt() * 100.0; // 0.1kW -> W
thing->setStateValue(goeHomeCurrentPowerPhaseCStateTypeId, 0);
thing->setStateValue(goeHomeCurrentPowerStateTypeId, 0);
}
if (measurementList.count() >= 7) { if (measurementList.count() >= 9)
thing->setStateValue(goeHomeCurrentPhaseCStateTypeId, measurementList.at(6).toUInt() / 10.0); powerPhaseB = measurementList.at(8).toUInt() * 100.0; // 0.1kW -> W
} else {
thing->setStateValue(goeHomeCurrentPhaseCStateTypeId, 0);
thing->setStateValue(goeHomeCurrentPowerPhaseAStateTypeId, 0); if (measurementList.count() >= 10)
thing->setStateValue(goeHomeCurrentPowerPhaseBStateTypeId, 0); powerPhaseC = measurementList.at(9).toUInt() * 100.0; // 0.1kW -> W
thing->setStateValue(goeHomeCurrentPowerPhaseCStateTypeId, 0);
thing->setStateValue(goeHomeCurrentPowerStateTypeId, 0);
}
if (measurementList.count() >= 8) { if (measurementList.count() >= 12)
thing->setStateValue(goeHomeCurrentPowerPhaseAStateTypeId, measurementList.at(7).toUInt() * 100.0); // 0.1kW -> W currentPower = measurementList.at(11).toUInt() * 10.0; // 0.01kW -> W
} else {
thing->setStateValue(goeHomeCurrentPowerPhaseAStateTypeId, 0);
thing->setStateValue(goeHomeCurrentPowerPhaseBStateTypeId, 0);
thing->setStateValue(goeHomeCurrentPowerPhaseCStateTypeId, 0);
thing->setStateValue(goeHomeCurrentPowerStateTypeId, 0);
}
if (measurementList.count() >= 9) { // Update all states
thing->setStateValue(goeHomeCurrentPowerPhaseBStateTypeId, measurementList.at(8).toUInt() * 100.0); // 0.1kW -> W thing->setStateValue(goeHomeVoltagePhaseAStateTypeId, voltagePhaseA);
} else { thing->setStateValue(goeHomeVoltagePhaseBStateTypeId, voltagePhaseB);
thing->setStateValue(goeHomeCurrentPowerPhaseBStateTypeId, 0); thing->setStateValue(goeHomeVoltagePhaseCStateTypeId, voltagePhaseC);
thing->setStateValue(goeHomeCurrentPowerPhaseCStateTypeId, 0); thing->setStateValue(goeHomeCurrentPhaseAStateTypeId, amperePhaseA);
thing->setStateValue(goeHomeCurrentPowerStateTypeId, 0); thing->setStateValue(goeHomeCurrentPhaseBStateTypeId, amperePhaseB);
} thing->setStateValue(goeHomeCurrentPhaseCStateTypeId, amperePhaseC);
thing->setStateValue(goeHomeCurrentPowerPhaseAStateTypeId, powerPhaseA);
thing->setStateValue(goeHomeCurrentPowerPhaseBStateTypeId, powerPhaseB);
thing->setStateValue(goeHomeCurrentPowerPhaseCStateTypeId, powerPhaseC);
if (measurementList.count() >= 10) { thing->setStateValue(goeHomeCurrentPowerStateTypeId, currentPower);
thing->setStateValue(goeHomeCurrentPowerPhaseCStateTypeId, measurementList.at(9).toUInt() * 100.0); // 0.1kW -> W
} else {
thing->setStateValue(goeHomeCurrentPowerPhaseCStateTypeId, 0);
thing->setStateValue(goeHomeCurrentPowerStateTypeId, 0);
}
if (measurementList.count() >= 11) { // Check how many phases are actually charging, and update the phase count only if something happens on the phases (current or power)
thing->setStateValue(goeHomeCurrentPowerStateTypeId, measurementList.at(11).toUInt() * 10.0); // 0.01kW -> W if (!(amperePhaseA == 0 && amperePhaseB == 0 && amperePhaseC == 0)) {
} else { uint phaseCount = 0;
thing->setStateValue(goeHomeCurrentPowerStateTypeId, 0); if (amperePhaseA != 0)
phaseCount += 1;
if (amperePhaseB != 0)
phaseCount += 1;
if (amperePhaseC != 0)
phaseCount += 1;
thing->setStateValue(goeHomePhaseCountStateTypeId, phaseCount);
} }
} }
} }

16
goecharger/integrationplugingoecharger.json
View File

@ -175,9 +175,9 @@
}, },
{ {
"id": "e8258831-ad89-4d27-b295-e8c10dd42b76", "id": "e8258831-ad89-4d27-b295-e8c10dd42b76",
"name": "chargeEnergy", "name": "sessionEnergy",
"displayName": "Charge energy", "displayName": "Session energy",
"displayNameEvent": "Charge energy changed", "displayNameEvent": "Session energy changed",
"type": "double", "type": "double",
"unit": "KiloWattHour", "unit": "KiloWattHour",
"defaultValue": 0.0, "defaultValue": 0.0,
@ -283,6 +283,16 @@
"defaultValue": 0.00, "defaultValue": 0.00,
"filter": "adaptive" "filter": "adaptive"
}, },
{
"id": "b78d805a-f97c-4c9d-a647-5fc98f8d6dd1",
"name": "phaseCount",
"displayName": "Number of charging phases",
"displayNameEvent": "Number of charging phases changed",
"type": "uint",
"minValue": 1,
"maxValue": 3,
"defaultValue": 1
},
{ {
"id": "b06479d5-7a38-4fbd-867e-e55bdb54651b", "id": "b06479d5-7a38-4fbd-867e-e55bdb54651b",
"name": "ledBrightness", "name": "ledBrightness",