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

Add connected/disconnected detection

master
Michael Zanetti 2022-04-05 13:29:32 +02:00
parent 4161d03ec5
commit 5d20d4759f
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
schrack/integrationpluginschrack.cpp
View File

@ -95,15 +95,15 @@ void IntegrationPluginSchrack::setupThing(ThingSetupInfo *info)
} }
CionModbusRtuConnection *cionConnection = new CionModbusRtuConnection(hardwareManager()->modbusRtuResource()->getModbusRtuMaster(uuid), address, this); CionModbusRtuConnection *cionConnection = new CionModbusRtuConnection(hardwareManager()->modbusRtuResource()->getModbusRtuMaster(uuid), address, this);
connect(cionConnection->modbusRtuMaster(), &ModbusRtuMaster::connectedChanged, thing, [=](bool connected){ // connect(cionConnection->modbusRtuMaster(), &ModbusRtuMaster::connectedChanged, thing, [=](bool connected){
if (connected) { // if (connected) {
qCDebug(dcSchrack()) << "Modbus RTU resource connected" << thing << cionConnection->modbusRtuMaster()->serialPort(); // qCDebug(dcSchrack()) << "Modbus RTU resource connected" << thing << cionConnection->modbusRtuMaster()->serialPort();
} else { // } else {
qCWarning(dcSchrack()) << "Modbus RTU resource disconnected" << thing << cionConnection->modbusRtuMaster()->serialPort(); // qCWarning(dcSchrack()) << "Modbus RTU resource disconnected" << thing << cionConnection->modbusRtuMaster()->serialPort();
} // thing->setStateValue(cionConnectedStateTypeId, false);
// }
thing->setStateValue(cionConnectedStateTypeId, connected); // });
});
connect(cionConnection, &CionModbusRtuConnection::chargingEnabledChanged, thing, [=](quint16 charging){ connect(cionConnection, &CionModbusRtuConnection::chargingEnabledChanged, thing, [=](quint16 charging){
qCDebug(dcSchrack()) << "Charging enabled changed:" << charging; qCDebug(dcSchrack()) << "Charging enabled changed:" << charging;
@ -158,7 +158,6 @@ void IntegrationPluginSchrack::setupThing(ThingSetupInfo *info)
connect(cionConnection, &CionModbusRtuConnection::gridVoltageChanged, thing, [=](float gridVoltage){ connect(cionConnection, &CionModbusRtuConnection::gridVoltageChanged, thing, [=](float gridVoltage){
qCDebug(dcSchrack()) << "Grid voltage changed:" << gridVoltage; qCDebug(dcSchrack()) << "Grid voltage changed:" << gridVoltage;
// updateCurrentPower(thing);
}); });
connect(cionConnection, &CionModbusRtuConnection::u1VoltageChanged, thing, [=](float u1Voltage){ connect(cionConnection, &CionModbusRtuConnection::u1VoltageChanged, thing, [=](float u1Voltage){
@ -195,9 +194,24 @@ void IntegrationPluginSchrack::postSetupThing(Thing *thing)
connect(m_refreshTimer, &PluginTimer::timeout, this, [this] { connect(m_refreshTimer, &PluginTimer::timeout, this, [this] {
foreach (Thing *thing, myThings()) { foreach (Thing *thing, myThings()) {
m_cionConnections.value(thing)->update(); CionModbusRtuConnection *connection = m_cionConnections.value(thing);
thing->setStateValue(cionChargingStateTypeId, m_cionConnections.value(thing)->chargingDuration() != m_lastChargingDuration); connection->update();
m_lastChargingDuration = m_cionConnections.value(thing)->chargingDuration();
// The only apparent way to know whether it is charging, is to compare if lastChargingDuration has changed
// If it didn't change in the last cycle
qulonglong lastChargingDuration = connection->property("lastChargingDuration").toULongLong();
thing->setStateValue(cionChargingStateTypeId, connection->chargingDuration() != lastChargingDuration);
connection->setProperty("lastChargingDuration", connection->chargingDuration());
// Reading the CP signal state to know if the wallbox is reachable.
// Note that this is also an "update" register, hence being read twice.
// We'll not actually evaluate the actual results in here because
// this piece of code should be replaced with the modbus tool internal connected detection when it's ready
ModbusRtuReply *reply = connection->readCpSignalState();
connect(reply, &ModbusRtuReply::finished, [reply, thing](){
qCDebug(dcSchrack) << "CP signal state reply finished" << reply->error();
thing->setStateValue(cionConnectedStateTypeId, reply->error() == ModbusRtuReply::NoError);
});
} }
}); });

2
schrack/integrationpluginschrack.h
View File

@ -66,8 +66,6 @@ private:
QHash<Thing *, CionModbusRtuConnection *> m_cionConnections; QHash<Thing *, CionModbusRtuConnection *> m_cionConnections;
QHash<ThingActionInfo*, StateTypeId> m_pendingActions; QHash<ThingActionInfo*, StateTypeId> m_pendingActions;
qulonglong m_lastChargingDuration = 0;
}; };
#endif // INTEGRATIONPLUGINSCHRACK_H #endif // INTEGRATIONPLUGINSCHRACK_H