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

Merge PR #224: PCE: Add status state representing the EV state

master
jenkins 2026-01-12 10:48:19 +01:00
parent 68480f9848 1e3a8f160f
commit 532b621367
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pcelectric/integrationpluginpcelectric.cpp
View File

@ -340,6 +340,33 @@ void IntegrationPluginPcElectric::setupConnection(ThingSetupInfo *info)
thing->setStateValue(ev11PhaseCountStateTypeId, connection->chargingRelayState() == EV11ModbusTcpConnection::ChargingRelayStateSinglePhase ? 1 : 3); thing->setStateValue(ev11PhaseCountStateTypeId, connection->chargingRelayState() == EV11ModbusTcpConnection::ChargingRelayStateSinglePhase ? 1 : 3);
} }
switch (connection->chargingState()) {
case PceWallbox::ChargingStateInitializing:
thing->setStateValue(ev11StatusStateTypeId, "Init");
break;
case PceWallbox::ChargingStateA1:
thing->setStateValue(ev11StatusStateTypeId, "A1");
break;
case PceWallbox::ChargingStateA2:
thing->setStateValue(ev11StatusStateTypeId, "A2");
break;
case PceWallbox::ChargingStateB1:
thing->setStateValue(ev11StatusStateTypeId, "B1");
break;
case PceWallbox::ChargingStateB2:
thing->setStateValue(ev11StatusStateTypeId, "B2");
break;
case PceWallbox::ChargingStateC1:
thing->setStateValue(ev11StatusStateTypeId, "C1");
break;
case PceWallbox::ChargingStateC2:
thing->setStateValue(ev11StatusStateTypeId, "C2");
break;
case PceWallbox::ChargingStateError:
thing->setStateValue(ev11StatusStateTypeId, "F");
break;
}
thing->setStateValue(ev11CurrentVersionStateTypeId, connection->firmwareRevision()); thing->setStateValue(ev11CurrentVersionStateTypeId, connection->firmwareRevision());
thing->setStateValue(ev11SessionEnergyStateTypeId, connection->powerMeter0()); thing->setStateValue(ev11SessionEnergyStateTypeId, connection->powerMeter0());
thing->setStateValue(ev11TemperatureStateTypeId, connection->temperature()); thing->setStateValue(ev11TemperatureStateTypeId, connection->temperature());
@ -411,6 +438,8 @@ void IntegrationPluginPcElectric::setupConnection(ThingSetupInfo *info)
thing->setSettingValue(ev11SettingsDigitalInputModeParamTypeId, "3 | Limit and S0 signaling"); thing->setSettingValue(ev11SettingsDigitalInputModeParamTypeId, "3 | Limit and S0 signaling");
break; break;
} }
thing->setStateValue(ev11DigitalInputModeStateTypeId, connection->digitalInputMode());
if (connection->firmwareRevision() >= "0022") { if (connection->firmwareRevision() >= "0022") {
thing->setSettingValue(ev11SettingsPhaseAutoSwitchPauseParamTypeId, connection->phaseAutoSwitchPause()); thing->setSettingValue(ev11SettingsPhaseAutoSwitchPauseParamTypeId, connection->phaseAutoSwitchPause());
@ -460,13 +489,14 @@ void IntegrationPluginPcElectric::setupConnection(ThingSetupInfo *info)
} }
QueuedModbusReply *reply = connection->setDigitalInputModeAsync(modeValue); QueuedModbusReply *reply = connection->setDigitalInputModeAsync(modeValue);
connect(reply, &QueuedModbusReply::finished, thing, [reply, modeValue](){ connect(reply, &QueuedModbusReply::finished, thing, [thing, reply, modeValue](){
if (reply->error() != QModbusDevice::NoError) { if (reply->error() != QModbusDevice::NoError) {
qCWarning(dcPcElectric()) << "Could not set digital input mode to" << modeValue << reply->errorString(); qCWarning(dcPcElectric()) << "Could not set digital input mode to" << modeValue << reply->errorString();
return; return;
} }
qCDebug(dcPcElectric()) << "Successfully set digital input mode to" << modeValue; qCDebug(dcPcElectric()) << "Successfully set digital input mode to" << modeValue;
thing->setStateValue(ev11DigitalInputModeStateTypeId, modeValue);
}); });
} else if (paramTypeId == ev11SettingsPhaseAutoSwitchPauseParamTypeId) { } else if (paramTypeId == ev11SettingsPhaseAutoSwitchPauseParamTypeId) {
quint16 registerValue = value.toUInt(); quint16 registerValue = value.toUInt();

17
pcelectric/integrationpluginpcelectric.json
View File

@ -218,6 +218,23 @@
"displayName": "Digital input flag", "displayName": "Digital input flag",
"type": "QString", "type": "QString",
"defaultValue": "" "defaultValue": ""
},
{
"id": "a10967b9-4a32-49cf-a6ae-885b3153d601",
"name": "status",
"displayName": "Status",
"type": "QString",
"defaultValue": "Init",
"suggestLogging": true
},
{
"id": "63639947-5e91-442f-858b-378b5bc5f1bc",
"name": "digitalInputMode",
"displayName": "Digital input mode",
"type": "uint",
"defaultValue": 0,
"minValue": 0,
"maxValue": 3
} }
] ]
} }