Clean code
l.heizinger
Simon Stürz
parent
06ef2eb01a
commit
27cd789b7f
|
|
@ -38,64 +38,56 @@ IntegrationPluginStiebelEltron::IntegrationPluginStiebelEltron() {}
|
|||
|
||||
void IntegrationPluginStiebelEltron::discoverThings(ThingDiscoveryInfo *info) {
|
||||
if (!hardwareManager()->networkDeviceDiscovery()->available()) {
|
||||
qCWarning(dcStiebelEltron())
|
||||
<< "The network discovery is not available on this platform.";
|
||||
info->finish(
|
||||
Thing::ThingErrorUnsupportedFeature,
|
||||
QT_TR_NOOP("The network device discovery is not available."));
|
||||
qCWarning(dcStiebelEltron()) << "The network discovery is not available on this platform.";
|
||||
info->finish(Thing::ThingErrorUnsupportedFeature,
|
||||
QT_TR_NOOP("The network device discovery is not available."));
|
||||
return;
|
||||
}
|
||||
|
||||
NetworkDeviceDiscoveryReply *discoveryReply =
|
||||
hardwareManager()->networkDeviceDiscovery()->discover();
|
||||
connect(
|
||||
discoveryReply, &NetworkDeviceDiscoveryReply::finished, this, [=]() {
|
||||
foreach (const NetworkDeviceInfo &networkDeviceInfo,
|
||||
discoveryReply->networkDeviceInfos()) {
|
||||
qCDebug(dcStiebelEltron()) << "Found" << networkDeviceInfo;
|
||||
connect(discoveryReply, &NetworkDeviceDiscoveryReply::finished, this, [=]() {
|
||||
foreach (const NetworkDeviceInfo &networkDeviceInfo, discoveryReply->networkDeviceInfos()) {
|
||||
qCDebug(dcStiebelEltron()) << "Found" << networkDeviceInfo;
|
||||
|
||||
QString title;
|
||||
if (networkDeviceInfo.hostName().isEmpty()) {
|
||||
title = networkDeviceInfo.address().toString();
|
||||
} else {
|
||||
title = networkDeviceInfo.hostName() + " (" +
|
||||
networkDeviceInfo.address().toString() + ")";
|
||||
}
|
||||
|
||||
QString description;
|
||||
if (networkDeviceInfo.macAddressManufacturer().isEmpty()) {
|
||||
description = networkDeviceInfo.macAddress();
|
||||
} else {
|
||||
description = networkDeviceInfo.macAddress() + " (" +
|
||||
networkDeviceInfo.macAddressManufacturer() +
|
||||
")";
|
||||
}
|
||||
|
||||
ThingDescriptor descriptor(stiebelEltronThingClassId, title,
|
||||
description);
|
||||
ParamList params;
|
||||
params << Param(stiebelEltronThingIpAddressParamTypeId,
|
||||
networkDeviceInfo.address().toString());
|
||||
params << Param(stiebelEltronThingMacAddressParamTypeId,
|
||||
networkDeviceInfo.macAddress());
|
||||
descriptor.setParams(params);
|
||||
|
||||
// Check if we already have set up this device
|
||||
Things existingThings = myThings().filterByParam(
|
||||
stiebelEltronThingMacAddressParamTypeId,
|
||||
networkDeviceInfo.macAddress());
|
||||
if (existingThings.count() == 1) {
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< "This connection already exists in the system:"
|
||||
<< networkDeviceInfo;
|
||||
descriptor.setThingId(existingThings.first()->id());
|
||||
}
|
||||
|
||||
info->addThingDescriptor(descriptor);
|
||||
QString title;
|
||||
if (networkDeviceInfo.hostName().isEmpty()) {
|
||||
title = networkDeviceInfo.address().toString();
|
||||
} else {
|
||||
title = networkDeviceInfo.hostName() + " (" +
|
||||
networkDeviceInfo.address().toString() + ")";
|
||||
}
|
||||
|
||||
info->finish(Thing::ThingErrorNoError);
|
||||
});
|
||||
QString description;
|
||||
if (networkDeviceInfo.macAddressManufacturer().isEmpty()) {
|
||||
description = networkDeviceInfo.macAddress();
|
||||
} else {
|
||||
description = networkDeviceInfo.macAddress() + " (" +
|
||||
networkDeviceInfo.macAddressManufacturer() + ")";
|
||||
}
|
||||
|
||||
ThingDescriptor descriptor(stiebelEltronThingClassId, title, description);
|
||||
ParamList params;
|
||||
params << Param(stiebelEltronThingIpAddressParamTypeId,
|
||||
networkDeviceInfo.address().toString());
|
||||
params << Param(stiebelEltronThingMacAddressParamTypeId,
|
||||
networkDeviceInfo.macAddress());
|
||||
descriptor.setParams(params);
|
||||
|
||||
// Check if we already have set up this device
|
||||
Things existingThings = myThings().filterByParam(
|
||||
stiebelEltronThingMacAddressParamTypeId, networkDeviceInfo.macAddress());
|
||||
if (existingThings.count() == 1) {
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< "This connection already exists in the system:" << networkDeviceInfo;
|
||||
descriptor.setThingId(existingThings.first()->id());
|
||||
}
|
||||
|
||||
info->addThingDescriptor(descriptor);
|
||||
}
|
||||
|
||||
info->finish(Thing::ThingErrorNoError);
|
||||
});
|
||||
}
|
||||
|
||||
void IntegrationPluginStiebelEltron::startMonitoringAutoThings() {}
|
||||
|
|
@ -105,235 +97,175 @@ void IntegrationPluginStiebelEltron::setupThing(ThingSetupInfo *info) {
|
|||
qCDebug(dcStiebelEltron()) << "Setup" << thing << thing->params();
|
||||
|
||||
if (thing->thingClassId() == stiebelEltronThingClassId) {
|
||||
QHostAddress address(
|
||||
thing->paramValue(stiebelEltronThingIpAddressParamTypeId)
|
||||
.toString());
|
||||
quint16 port =
|
||||
thing->paramValue(stiebelEltronThingPortParamTypeId).toUInt();
|
||||
quint16 slaveId =
|
||||
thing->paramValue(stiebelEltronThingSlaveIdParamTypeId).toUInt();
|
||||
QHostAddress address(thing->paramValue(stiebelEltronThingIpAddressParamTypeId).toString());
|
||||
quint16 port = thing->paramValue(stiebelEltronThingPortParamTypeId).toUInt();
|
||||
quint16 slaveId = thing->paramValue(stiebelEltronThingSlaveIdParamTypeId).toUInt();
|
||||
|
||||
StiebelEltronModbusConnection *connection =
|
||||
new StiebelEltronModbusConnection(address, port, slaveId, this);
|
||||
|
||||
connect(
|
||||
connection, &StiebelEltronModbusConnection::connectionStateChanged,
|
||||
this, [thing, connection](bool status) {
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< "Connected changed to" << status << "for" << thing;
|
||||
if (status) {
|
||||
connection->update();
|
||||
}
|
||||
connect(connection, &StiebelEltronModbusConnection::connectionStateChanged, this,
|
||||
[thing, connection](bool status) {
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< "Connected changed to" << status << "for" << thing;
|
||||
if (status) {
|
||||
connection->update();
|
||||
}
|
||||
|
||||
thing->setStateValue(stiebelEltronConnectedStateTypeId, status);
|
||||
});
|
||||
thing->setStateValue(stiebelEltronConnectedStateTypeId, status);
|
||||
});
|
||||
|
||||
connect(connection,
|
||||
&StiebelEltronModbusConnection::outdoorTemperatureChanged, this,
|
||||
connect(connection, &StiebelEltronModbusConnection::outdoorTemperatureChanged, this,
|
||||
[thing](float outdoorTemperature) {
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< thing << "outdoor temperature changed"
|
||||
<< outdoorTemperature << "°C";
|
||||
thing->setStateValue(
|
||||
stiebelEltronOutdoorTemperatureStateTypeId,
|
||||
outdoorTemperature);
|
||||
<< thing << "outdoor temperature changed" << outdoorTemperature << "°C";
|
||||
thing->setStateValue(stiebelEltronOutdoorTemperatureStateTypeId,
|
||||
outdoorTemperature);
|
||||
});
|
||||
|
||||
connect(
|
||||
connection, &StiebelEltronModbusConnection::flowTemperatureChanged,
|
||||
this, [thing](float flowTemperature) {
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< thing << "flow temperature changed" << flowTemperature
|
||||
<< "°C";
|
||||
thing->setStateValue(stiebelEltronFlowTemperatureStateTypeId,
|
||||
flowTemperature);
|
||||
});
|
||||
connect(connection, &StiebelEltronModbusConnection::flowTemperatureChanged, this,
|
||||
[thing](float flowTemperature) {
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< thing << "flow temperature changed" << flowTemperature << "°C";
|
||||
thing->setStateValue(stiebelEltronFlowTemperatureStateTypeId, flowTemperature);
|
||||
});
|
||||
|
||||
connect(connection,
|
||||
&StiebelEltronModbusConnection::hotWaterTemperatureChanged,
|
||||
this, [thing](float hotWaterTemperature) {
|
||||
connect(connection, &StiebelEltronModbusConnection::hotWaterTemperatureChanged, this,
|
||||
[thing](float hotWaterTemperature) {
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< thing << "hot water temperature changed"
|
||||
<< hotWaterTemperature << "°C";
|
||||
thing->setStateValue(
|
||||
stiebelEltronHotWaterTemperatureStateTypeId,
|
||||
hotWaterTemperature);
|
||||
<< thing << "hot water temperature changed" << hotWaterTemperature << "°C";
|
||||
thing->setStateValue(stiebelEltronHotWaterTemperatureStateTypeId,
|
||||
hotWaterTemperature);
|
||||
});
|
||||
connect(connection,
|
||||
&StiebelEltronModbusConnection::storageTankTemperatureChanged,
|
||||
this, [thing](float storageTankTemperature) {
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< thing << "Storage tank temperature changed"
|
||||
<< storageTankTemperature << "°C";
|
||||
thing->setStateValue(
|
||||
stiebelEltronStorageTankTemperatureStateTypeId,
|
||||
storageTankTemperature);
|
||||
|
||||
connect(connection, &StiebelEltronModbusConnection::storageTankTemperatureChanged, this,
|
||||
[thing](float storageTankTemperature) {
|
||||
qCDebug(dcStiebelEltron()) << thing << "Storage tank temperature changed"
|
||||
<< storageTankTemperature << "°C";
|
||||
thing->setStateValue(stiebelEltronStorageTankTemperatureStateTypeId,
|
||||
storageTankTemperature);
|
||||
});
|
||||
connect(connection,
|
||||
&StiebelEltronModbusConnection::returnTemperatureChanged, this,
|
||||
|
||||
connect(connection, &StiebelEltronModbusConnection::returnTemperatureChanged, this,
|
||||
[thing](float returnTemperature) {
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< thing << "return temperature changed"
|
||||
<< returnTemperature << "°C";
|
||||
thing->setStateValue(
|
||||
stiebelEltronReturnTemperatureStateTypeId,
|
||||
returnTemperature);
|
||||
<< thing << "return temperature changed" << returnTemperature << "°C";
|
||||
thing->setStateValue(stiebelEltronReturnTemperatureStateTypeId,
|
||||
returnTemperature);
|
||||
});
|
||||
connect(
|
||||
connection, &StiebelEltronModbusConnection::heatingEnergyChanged,
|
||||
this, [thing](quint32 heatingEnergy) {
|
||||
// kWh and MWh of energy are stored in two registers an read as
|
||||
// an uint32. The following arithmetic splits the uint32 into
|
||||
// two uint16 and sums up the MWh and kWh values.
|
||||
quint32 correctedEnergy =
|
||||
(heatingEnergy >> 16) + (heatingEnergy & 0xFFFF) * 1000;
|
||||
qCDebug(dcStiebelEltron()) << thing << "Heating energy changed"
|
||||
<< correctedEnergy << "kWh";
|
||||
thing->setStateValue(stiebelEltronHeatingEnergyStateTypeId,
|
||||
correctedEnergy);
|
||||
});
|
||||
connect(connection,
|
||||
&StiebelEltronModbusConnection::hotWaterEnergyChanged, this,
|
||||
|
||||
connect(connection, &StiebelEltronModbusConnection::heatingEnergyChanged, this,
|
||||
[thing](quint32 heatingEnergy) {
|
||||
// kWh and MWh of energy are stored in two registers an read as
|
||||
// an uint32. The following arithmetic splits the uint32 into
|
||||
// two uint16 and sums up the MWh and kWh values.
|
||||
quint32 correctedEnergy =
|
||||
(heatingEnergy >> 16) + (heatingEnergy & 0xFFFF) * 1000;
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< thing << "Heating energy changed" << correctedEnergy << "kWh";
|
||||
thing->setStateValue(stiebelEltronHeatingEnergyStateTypeId, correctedEnergy);
|
||||
});
|
||||
|
||||
connect(connection, &StiebelEltronModbusConnection::hotWaterEnergyChanged, this,
|
||||
[thing](quint32 hotWaterEnergy) {
|
||||
// see comment in heatingEnergyChanged
|
||||
quint32 correctedEnergy = (hotWaterEnergy >> 16) +
|
||||
(hotWaterEnergy & 0xFFFF) * 1000;
|
||||
quint32 correctedEnergy =
|
||||
(hotWaterEnergy >> 16) + (hotWaterEnergy & 0xFFFF) * 1000;
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< thing << "Hot Water energy changed"
|
||||
<< correctedEnergy << "kWh";
|
||||
thing->setStateValue(stiebelEltronHotWaterEnergyStateTypeId,
|
||||
<< thing << "Hot Water energy changed" << correctedEnergy << "kWh";
|
||||
thing->setStateValue(stiebelEltronHotWaterEnergyStateTypeId, correctedEnergy);
|
||||
});
|
||||
|
||||
connect(connection, &StiebelEltronModbusConnection::consumedEnergyHeatingChanged, this,
|
||||
[thing](quint32 consumedEnergyHeatingEnergy) {
|
||||
// see comment in heatingEnergyChanged
|
||||
quint32 correctedEnergy = (consumedEnergyHeatingEnergy >> 16) +
|
||||
(consumedEnergyHeatingEnergy & 0xFFFF) * 1000;
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< thing << "Consumed energy Heating changed" << correctedEnergy << "kWh";
|
||||
thing->setStateValue(stiebelEltronConsumedEnergyHeatingStateTypeId,
|
||||
correctedEnergy);
|
||||
});
|
||||
connect(connection,
|
||||
&StiebelEltronModbusConnection::consumedEnergyHeatingChanged,
|
||||
this, [thing](quint32 consumedEnergyHeatingEnergy) {
|
||||
|
||||
connect(connection, &StiebelEltronModbusConnection::consumedEnergyHotWaterChanged, this,
|
||||
[thing](quint32 consumedEnergyHotWaterEnergy) {
|
||||
// see comment in heatingEnergyChanged
|
||||
quint32 correctedEnergy =
|
||||
(consumedEnergyHeatingEnergy >> 16) +
|
||||
(consumedEnergyHeatingEnergy & 0xFFFF) * 1000;
|
||||
quint32 correctedEnergy = (consumedEnergyHotWaterEnergy >> 16) +
|
||||
(consumedEnergyHotWaterEnergy & 0xFFFF) * 1000;
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< thing << "Consumed energy Heating changed"
|
||||
<< correctedEnergy << "kWh";
|
||||
thing->setStateValue(
|
||||
stiebelEltronConsumedEnergyHeatingStateTypeId,
|
||||
correctedEnergy);
|
||||
});
|
||||
connect(connection,
|
||||
&StiebelEltronModbusConnection::consumedEnergyHotWaterChanged,
|
||||
this, [thing](quint32 consumedEnergyHotWaterEnergy) {
|
||||
// see comment in heatingEnergyChanged
|
||||
quint32 correctedEnergy =
|
||||
(consumedEnergyHotWaterEnergy >> 16) +
|
||||
(consumedEnergyHotWaterEnergy & 0xFFFF) * 1000;
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< thing << "Consumed energy hot water changed"
|
||||
<< correctedEnergy << "kWh";
|
||||
thing->setStateValue(
|
||||
stiebelEltronConsumedEnergyHotWaterStateTypeId,
|
||||
correctedEnergy);
|
||||
<< thing << "Consumed energy hot water changed" << correctedEnergy << "kWh";
|
||||
thing->setStateValue(stiebelEltronConsumedEnergyHotWaterStateTypeId,
|
||||
correctedEnergy);
|
||||
});
|
||||
|
||||
connect(
|
||||
connection, &StiebelEltronModbusConnection::operatingModeChanged,
|
||||
this,
|
||||
[thing](
|
||||
StiebelEltronModbusConnection::OperatingMode operatingMode) {
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< thing << "operating mode changed " << operatingMode;
|
||||
connection, &StiebelEltronModbusConnection::operatingModeChanged, this,
|
||||
[thing](StiebelEltronModbusConnection::OperatingMode operatingMode) {
|
||||
qCDebug(dcStiebelEltron()) << thing << "operating mode changed " << operatingMode;
|
||||
switch (operatingMode) {
|
||||
case StiebelEltronModbusConnection::OperatingModeEmergency:
|
||||
thing->setStateValue(
|
||||
stiebelEltronOperatingModeStateTypeId, "Emergency");
|
||||
thing->setStateValue(stiebelEltronOperatingModeStateTypeId, "Emergency");
|
||||
break;
|
||||
case StiebelEltronModbusConnection::OperatingModeStandby:
|
||||
thing->setStateValue(
|
||||
stiebelEltronOperatingModeStateTypeId, "Standby");
|
||||
thing->setStateValue(stiebelEltronOperatingModeStateTypeId, "Standby");
|
||||
break;
|
||||
case StiebelEltronModbusConnection::OperatingModeProgram:
|
||||
thing->setStateValue(
|
||||
stiebelEltronOperatingModeStateTypeId, "Program");
|
||||
thing->setStateValue(stiebelEltronOperatingModeStateTypeId, "Program");
|
||||
break;
|
||||
case StiebelEltronModbusConnection::OperatingModeComfort:
|
||||
thing->setStateValue(
|
||||
stiebelEltronOperatingModeStateTypeId, "Comfort");
|
||||
thing->setStateValue(stiebelEltronOperatingModeStateTypeId, "Comfort");
|
||||
break;
|
||||
case StiebelEltronModbusConnection::OperatingModeEco:
|
||||
thing->setStateValue(
|
||||
stiebelEltronOperatingModeStateTypeId, "Eco");
|
||||
thing->setStateValue(stiebelEltronOperatingModeStateTypeId, "Eco");
|
||||
break;
|
||||
case StiebelEltronModbusConnection::OperatingModeHotWater:
|
||||
thing->setStateValue(
|
||||
stiebelEltronOperatingModeStateTypeId, "Hot water");
|
||||
thing->setStateValue(stiebelEltronOperatingModeStateTypeId, "Hot water");
|
||||
break;
|
||||
}
|
||||
});
|
||||
connect(connection, &StiebelEltronModbusConnection::systemStatusChanged,
|
||||
this, [thing](uint16_t systemStatus) {
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< thing << "System status changed " << systemStatus;
|
||||
|
||||
thing->setStateValue(stiebelEltronPumpOneStateTypeId,
|
||||
systemStatus & (1 << 0));
|
||||
|
||||
thing->setStateValue(stiebelEltronPumpTwoStateTypeId,
|
||||
systemStatus & (1 << 1));
|
||||
thing->setStateValue(stiebelEltronHeatingUpStateTypeId,
|
||||
systemStatus & (1 << 2));
|
||||
|
||||
thing->setStateValue(stiebelEltronAuxHeatingStateTypeId,
|
||||
systemStatus & (1 << 3));
|
||||
thing->setStateValue(stiebelEltronHeatingStateTypeId,
|
||||
systemStatus & (1 << 4));
|
||||
thing->setStateValue(stiebelEltronHotWaterStateTypeId,
|
||||
systemStatus & (1 << 5));
|
||||
thing->setStateValue(stiebelEltronCompressorStateTypeId,
|
||||
systemStatus & (1 << 6));
|
||||
thing->setStateValue(stiebelEltronSummerModeStateTypeId,
|
||||
systemStatus & (1 << 7));
|
||||
thing->setStateValue(stiebelEltronCoolingModeStateTypeId,
|
||||
systemStatus & (1 << 8));
|
||||
thing->setStateValue(stiebelEltronDefrostingStateTypeId,
|
||||
systemStatus & (1 << 9));
|
||||
thing->setStateValue(stiebelEltronSilentModeStateTypeId,
|
||||
systemStatus & (1 << 10));
|
||||
thing->setStateValue(stiebelEltronSilentMode2StateTypeId,
|
||||
systemStatus & (1 << 11));
|
||||
});
|
||||
|
||||
connect(
|
||||
connection, &StiebelEltronModbusConnection::sgReadyStateChanged,
|
||||
this,
|
||||
[thing](
|
||||
StiebelEltronModbusConnection::SmartGridState smartGridState) {
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< thing << "SG Ready activation changed" << smartGridState;
|
||||
switch (smartGridState) {
|
||||
case StiebelEltronModbusConnection::SmartGridStateModeOne:
|
||||
thing->setStateValue(
|
||||
stiebelEltronSgReadyModeStateTypeId, "Mode 1");
|
||||
break;
|
||||
case StiebelEltronModbusConnection::SmartGridStateModeTwo:
|
||||
thing->setStateValue(
|
||||
stiebelEltronSgReadyModeStateTypeId, "Mode 2");
|
||||
break;
|
||||
case StiebelEltronModbusConnection::SmartGridStateModeThree:
|
||||
thing->setStateValue(
|
||||
stiebelEltronSgReadyModeStateTypeId, "Mode 3");
|
||||
break;
|
||||
case StiebelEltronModbusConnection::SmartGridStateModeFour:
|
||||
thing->setStateValue(
|
||||
stiebelEltronSgReadyModeStateTypeId, "Mode 4");
|
||||
break;
|
||||
}
|
||||
connection, &StiebelEltronModbusConnection::systemStatusChanged, this,
|
||||
[thing](uint16_t systemStatus) {
|
||||
qCDebug(dcStiebelEltron()) << thing << "System status changed " << systemStatus;
|
||||
thing->setStateValue(stiebelEltronPumpOneStateTypeId, systemStatus & (1 << 0));
|
||||
thing->setStateValue(stiebelEltronPumpTwoStateTypeId, systemStatus & (1 << 1));
|
||||
thing->setStateValue(stiebelEltronHeatingUpStateTypeId, systemStatus & (1 << 2));
|
||||
thing->setStateValue(stiebelEltronAuxHeatingStateTypeId, systemStatus & (1 << 3));
|
||||
thing->setStateValue(stiebelEltronHeatingStateTypeId, systemStatus & (1 << 4));
|
||||
thing->setStateValue(stiebelEltronHotWaterStateTypeId, systemStatus & (1 << 5));
|
||||
thing->setStateValue(stiebelEltronCompressorStateTypeId, systemStatus & (1 << 6));
|
||||
thing->setStateValue(stiebelEltronSummerModeStateTypeId, systemStatus & (1 << 7));
|
||||
thing->setStateValue(stiebelEltronCoolingModeStateTypeId, systemStatus & (1 << 8));
|
||||
thing->setStateValue(stiebelEltronDefrostingStateTypeId, systemStatus & (1 << 9));
|
||||
thing->setStateValue(stiebelEltronSilentModeStateTypeId, systemStatus & (1 << 10));
|
||||
thing->setStateValue(stiebelEltronSilentMode2StateTypeId, systemStatus & (1 << 11));
|
||||
});
|
||||
connect(connection,
|
||||
&StiebelEltronModbusConnection::sgReadyActiveChanged, this,
|
||||
|
||||
connect(connection, &StiebelEltronModbusConnection::sgReadyStateChanged, this,
|
||||
[thing](StiebelEltronModbusConnection::SmartGridState smartGridState) {
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< thing << "SG Ready activation changed" << smartGridState;
|
||||
switch (smartGridState) {
|
||||
case StiebelEltronModbusConnection::SmartGridStateModeOne:
|
||||
thing->setStateValue(stiebelEltronSgReadyModeStateTypeId, "Mode 1");
|
||||
break;
|
||||
case StiebelEltronModbusConnection::SmartGridStateModeTwo:
|
||||
thing->setStateValue(stiebelEltronSgReadyModeStateTypeId, "Mode 2");
|
||||
break;
|
||||
case StiebelEltronModbusConnection::SmartGridStateModeThree:
|
||||
thing->setStateValue(stiebelEltronSgReadyModeStateTypeId, "Mode 3");
|
||||
break;
|
||||
case StiebelEltronModbusConnection::SmartGridStateModeFour:
|
||||
thing->setStateValue(stiebelEltronSgReadyModeStateTypeId, "Mode 4");
|
||||
break;
|
||||
}
|
||||
});
|
||||
connect(connection, &StiebelEltronModbusConnection::sgReadyActiveChanged, this,
|
||||
[thing](bool smartGridActive) {
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< thing << "SG Ready activation changed"
|
||||
<< smartGridActive;
|
||||
thing->setStateValue(stiebelEltronSgReadyActiveStateTypeId,
|
||||
smartGridActive);
|
||||
<< thing << "SG Ready activation changed" << smartGridActive;
|
||||
thing->setStateValue(stiebelEltronSgReadyActiveStateTypeId, smartGridActive);
|
||||
});
|
||||
|
||||
m_connections.insert(thing, connection);
|
||||
|
|
@ -347,11 +279,9 @@ void IntegrationPluginStiebelEltron::postSetupThing(Thing *thing) {
|
|||
if (thing->thingClassId() == stiebelEltronThingClassId) {
|
||||
if (!m_pluginTimer) {
|
||||
qCDebug(dcStiebelEltron()) << "Starting plugin timer...";
|
||||
m_pluginTimer =
|
||||
hardwareManager()->pluginTimerManager()->registerTimer(10);
|
||||
m_pluginTimer = hardwareManager()->pluginTimerManager()->registerTimer(10);
|
||||
connect(m_pluginTimer, &PluginTimer::timeout, this, [this] {
|
||||
foreach (StiebelEltronModbusConnection *connection,
|
||||
m_connections) {
|
||||
foreach (StiebelEltronModbusConnection *connection, m_connections) {
|
||||
if (connection->connected()) {
|
||||
connection->update();
|
||||
}
|
||||
|
|
@ -364,8 +294,7 @@ void IntegrationPluginStiebelEltron::postSetupThing(Thing *thing) {
|
|||
}
|
||||
|
||||
void IntegrationPluginStiebelEltron::thingRemoved(Thing *thing) {
|
||||
if (thing->thingClassId() == stiebelEltronThingClassId &&
|
||||
m_connections.contains(thing)) {
|
||||
if (thing->thingClassId() == stiebelEltronThingClassId && m_connections.contains(thing)) {
|
||||
m_connections.take(thing)->deleteLater();
|
||||
}
|
||||
|
||||
|
|
@ -392,16 +321,13 @@ void IntegrationPluginStiebelEltron::executeAction(ThingActionInfo *info) {
|
|||
info->finish(Thing::ThingErrorNoError);
|
||||
}
|
||||
|
||||
if (info->action().actionTypeId() ==
|
||||
stiebelEltronSgReadyActiveActionTypeId) {
|
||||
if (info->action().actionTypeId() == stiebelEltronSgReadyActiveActionTypeId) {
|
||||
bool sgReadyActiveBool =
|
||||
info->action()
|
||||
.paramValue(
|
||||
stiebelEltronSgReadyActiveActionSgReadyActiveParamTypeId)
|
||||
.paramValue(stiebelEltronSgReadyActiveActionSgReadyActiveParamTypeId)
|
||||
.toBool();
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< "Execute action" << info->action().actionTypeId().toString()
|
||||
<< info->action().params();
|
||||
qCDebug(dcStiebelEltron()) << "Execute action" << info->action().actionTypeId().toString()
|
||||
<< info->action().params();
|
||||
qCDebug(dcStiebelEltron()) << "Value: " << sgReadyActiveBool;
|
||||
|
||||
QModbusReply *reply = connection->setSgReadyActive(sgReadyActiveBool);
|
||||
|
|
@ -412,58 +338,43 @@ void IntegrationPluginStiebelEltron::executeAction(ThingActionInfo *info) {
|
|||
return;
|
||||
}
|
||||
|
||||
connect(reply, &QModbusReply::finished, reply,
|
||||
&QModbusReply::deleteLater);
|
||||
connect(reply, &QModbusReply::finished, info,
|
||||
[info, reply, sgReadyActiveBool] {
|
||||
if (reply->error() != QModbusDevice::NoError) {
|
||||
qCWarning(dcStiebelEltron())
|
||||
<< "Set SG ready activation finished with error"
|
||||
<< reply->errorString();
|
||||
info->finish(Thing::ThingErrorHardwareFailure);
|
||||
return;
|
||||
}
|
||||
connect(reply, &QModbusReply::finished, reply, &QModbusReply::deleteLater);
|
||||
connect(reply, &QModbusReply::finished, info, [info, reply, sgReadyActiveBool] {
|
||||
if (reply->error() != QModbusDevice::NoError) {
|
||||
qCWarning(dcStiebelEltron())
|
||||
<< "Set SG ready activation finished with error" << reply->errorString();
|
||||
info->finish(Thing::ThingErrorHardwareFailure);
|
||||
return;
|
||||
}
|
||||
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< "Execute action finished successfully"
|
||||
<< info->action().actionTypeId().toString()
|
||||
<< info->action().params();
|
||||
info->thing()->setStateValue(
|
||||
stiebelEltronSgReadyActiveStateTypeId,
|
||||
sgReadyActiveBool);
|
||||
info->finish(Thing::ThingErrorNoError);
|
||||
});
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< "Execute action finished successfully"
|
||||
<< info->action().actionTypeId().toString() << info->action().params();
|
||||
info->thing()->setStateValue(stiebelEltronSgReadyActiveStateTypeId, sgReadyActiveBool);
|
||||
info->finish(Thing::ThingErrorNoError);
|
||||
});
|
||||
|
||||
connect(reply, &QModbusReply::errorOccurred, this,
|
||||
[reply](QModbusDevice::Error error) {
|
||||
qCWarning(dcStiebelEltron())
|
||||
<< "Modbus reply error occurred while execute action"
|
||||
<< error << reply->errorString();
|
||||
emit reply->finished(); // To make sure it will be deleted
|
||||
});
|
||||
} else if (info->action().actionTypeId() ==
|
||||
stiebelEltronSgReadyModeActionTypeId) {
|
||||
connect(reply, &QModbusReply::errorOccurred, this, [reply](QModbusDevice::Error error) {
|
||||
qCWarning(dcStiebelEltron()) << "Modbus reply error occurred while execute action"
|
||||
<< error << reply->errorString();
|
||||
emit reply->finished(); // To make sure it will be deleted
|
||||
});
|
||||
} else if (info->action().actionTypeId() == stiebelEltronSgReadyModeActionTypeId) {
|
||||
QString sgReadyModeString =
|
||||
info->action()
|
||||
.paramValue(
|
||||
stiebelEltronSgReadyModeActionSgReadyModeParamTypeId)
|
||||
.paramValue(stiebelEltronSgReadyModeActionSgReadyModeParamTypeId)
|
||||
.toString();
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< "Execute action" << info->action().actionTypeId().toString()
|
||||
<< info->action().params();
|
||||
qCDebug(dcStiebelEltron()) << "Execute action" << info->action().actionTypeId().toString()
|
||||
<< info->action().params();
|
||||
StiebelEltronModbusConnection::SmartGridState sgReadyState;
|
||||
if (sgReadyModeString == "Mode 1") {
|
||||
sgReadyState =
|
||||
StiebelEltronModbusConnection::SmartGridStateModeOne;
|
||||
sgReadyState = StiebelEltronModbusConnection::SmartGridStateModeOne;
|
||||
} else if (sgReadyModeString == "Mode 2") {
|
||||
sgReadyState =
|
||||
StiebelEltronModbusConnection::SmartGridStateModeTwo;
|
||||
sgReadyState = StiebelEltronModbusConnection::SmartGridStateModeTwo;
|
||||
} else if (sgReadyModeString == "Mode 3") {
|
||||
sgReadyState =
|
||||
StiebelEltronModbusConnection::SmartGridStateModeThree;
|
||||
sgReadyState = StiebelEltronModbusConnection::SmartGridStateModeThree;
|
||||
} else {
|
||||
sgReadyState =
|
||||
StiebelEltronModbusConnection::SmartGridStateModeFour;
|
||||
sgReadyState = StiebelEltronModbusConnection::SmartGridStateModeFour;
|
||||
}
|
||||
|
||||
QModbusReply *reply = connection->setSgReadyState(sgReadyState);
|
||||
|
|
@ -474,34 +385,27 @@ void IntegrationPluginStiebelEltron::executeAction(ThingActionInfo *info) {
|
|||
return;
|
||||
}
|
||||
|
||||
connect(reply, &QModbusReply::finished, reply,
|
||||
&QModbusReply::deleteLater);
|
||||
connect(reply, &QModbusReply::finished, info,
|
||||
[info, reply, sgReadyModeString] {
|
||||
if (reply->error() != QModbusDevice::NoError) {
|
||||
qCWarning(dcStiebelEltron())
|
||||
<< "Set SG ready mode finished with error"
|
||||
<< reply->errorString();
|
||||
info->finish(Thing::ThingErrorHardwareFailure);
|
||||
return;
|
||||
}
|
||||
connect(reply, &QModbusReply::finished, reply, &QModbusReply::deleteLater);
|
||||
connect(reply, &QModbusReply::finished, info, [info, reply, sgReadyModeString] {
|
||||
if (reply->error() != QModbusDevice::NoError) {
|
||||
qCWarning(dcStiebelEltron())
|
||||
<< "Set SG ready mode finished with error" << reply->errorString();
|
||||
info->finish(Thing::ThingErrorHardwareFailure);
|
||||
return;
|
||||
}
|
||||
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< "Execute action finished successfully"
|
||||
<< info->action().actionTypeId().toString()
|
||||
<< info->action().params();
|
||||
info->thing()->setStateValue(
|
||||
stiebelEltronSgReadyModeStateTypeId, sgReadyModeString);
|
||||
info->finish(Thing::ThingErrorNoError);
|
||||
});
|
||||
qCDebug(dcStiebelEltron())
|
||||
<< "Execute action finished successfully"
|
||||
<< info->action().actionTypeId().toString() << info->action().params();
|
||||
info->thing()->setStateValue(stiebelEltronSgReadyModeStateTypeId, sgReadyModeString);
|
||||
info->finish(Thing::ThingErrorNoError);
|
||||
});
|
||||
|
||||
connect(reply, &QModbusReply::errorOccurred, this,
|
||||
[reply](QModbusDevice::Error error) {
|
||||
qCWarning(dcStiebelEltron())
|
||||
<< "Modbus reply error occurred while execute action"
|
||||
<< error << reply->errorString();
|
||||
emit reply->finished(); // To make sure it will be deleted
|
||||
});
|
||||
connect(reply, &QModbusReply::errorOccurred, this, [reply](QModbusDevice::Error error) {
|
||||
qCWarning(dcStiebelEltron()) << "Modbus reply error occurred while execute action"
|
||||
<< error << reply->errorString();
|
||||
emit reply->finished(); // To make sure it will be deleted
|
||||
});
|
||||
}
|
||||
info->finish(Thing::ThingErrorNoError);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue