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

INRO: Make sure charging is enabled if session continues with play

Browse Source
This commit is contained in:
Simon Stürz 2024-09-25 16:00:27 +02:00
parent e5b4856072
commit 0a114e47ee
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
inro/integrationplugininro.cpp
View File

@ -128,8 +128,8 @@ void IntegrationPluginInro::executeAction(ThingActionInfo *info)
if (info->action().actionTypeId() == pantaboxPowerActionTypeId) { if (info->action().actionTypeId() == pantaboxPowerActionTypeId) {
bool power = info->action().paramValue(pantaboxPowerActionPowerParamTypeId).toBool(); bool power = info->action().paramValue(pantaboxPowerActionPowerParamTypeId).toBool();
// Play/pause charging session feature is available from Modbus Tcp version 1.1 // Play/pause charging session feature is available since Modbus Tcp version 1.2 (0x0001 0x0002) 0x10002 = 65538
if (connection->modbusTcpVersion() <= 65536) { if (connection->modbusTcpVersion() < 65538) {
// When power is set by user, charging is going to stop or start depending on setting // When power is set by user, charging is going to stop or start depending on setting
qCDebug(dcInro()) << "Set power by user" << (power ? 1 : 0); qCDebug(dcInro()) << "Set power by user" << (power ? 1 : 0);
QModbusReply *reply = connection->setChargingEnabled(power ? 1 : 0); QModbusReply *reply = connection->setChargingEnabled(power ? 1 : 0);
@ -152,7 +152,11 @@ void IntegrationPluginInro::executeAction(ThingActionInfo *info)
} }
}); });
return; return;
} else { } else {
// Modbus version >= 1.2
if (info->action().triggeredBy() == Action::TriggeredByUser) { if (info->action().triggeredBy() == Action::TriggeredByUser) {
// When power is set by user, charging is going to stop or start depending on setting // When power is set by user, charging is going to stop or start depending on setting
@ -177,6 +181,7 @@ void IntegrationPluginInro::executeAction(ThingActionInfo *info)
} }
}); });
return; return;
} else { } else {
// When power is set to 0 by automatisnm, max charging current is set to 0 otherwise take the configured max charging current // When power is set to 0 by automatisnm, max charging current is set to 0 otherwise take the configured max charging current
qCDebug(dcInro()) << "Going to play/pause charging session"; qCDebug(dcInro()) << "Going to play/pause charging session";
@ -191,15 +196,27 @@ void IntegrationPluginInro::executeAction(ThingActionInfo *info)
} }
connect(reply, &QModbusReply::finished, reply, &QModbusReply::deleteLater); connect(reply, &QModbusReply::finished, reply, &QModbusReply::deleteLater);
connect(reply, &QModbusReply::finished, info, [info, reply, power](){ connect(reply, &QModbusReply::finished, info, [info, reply, power, connection](){
if (reply->error() == QModbusDevice::NoError) { if (reply->error() == QModbusDevice::NoError) {
qCDebug(dcInro()) << (power ? "Play" : "Pause") << "session by energy manager"; qCDebug(dcInro()) << (power ? "Play" : "Pause") << "session by energy manager";
info->finish(Thing::ThingErrorNoError); info->finish(Thing::ThingErrorNoError);
if (power) {
// Make sure the charging is enabled, just in case
QModbusReply *reply = connection->setChargingEnabled(1);
connect(reply, &QModbusReply::finished, reply, &QModbusReply::deleteLater);
connect(reply, &QModbusReply::finished, info, [reply](){
if (reply->error() != QModbusDevice::NoError) {
qCWarning(dcInro()) << "Error setting charging enabled:" << reply->error() << reply->errorString();
}
});
}
} else { } else {
qCWarning(dcInro()) << "Error setting charging current:" << reply->error() << reply->errorString(); qCWarning(dcInro()) << "Error setting charging current:" << reply->error() << reply->errorString();
info->finish(Thing::ThingErrorHardwareFailure); info->finish(Thing::ThingErrorHardwareFailure);
} }
}); });
return; return;
} }
} }