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

Added smartmeterconsumer interface

master
trinnes 2023-01-27 18:45:23 +01:00
parent 3fa711b774
commit 4173d9bb4a
4 changed files with 319 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
drexelundweiss/integrationplugindrexelundweiss.cpp
View File

@ -1,6 +1,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Copyright 2013 - 2021, nymea GmbH
* Copyright 2013 - 2023, nymea GmbH
* Contact: contact@nymea.io
*
* This file is part of nymea.
@ -315,20 +315,92 @@ void IntegrationPluginDrexelUndWeiss::updateStates(Thing *thing)
readHoldingRegister(thing, modbus, slaveAddress, ModbusRegisterX2::BrauchwasserSolltermperatur);
readHoldingRegister(thing, modbus, slaveAddress, ModbusRegisterX2::Auszenluft);
readHoldingRegister(thing, modbus, slaveAddress, ModbusRegisterX2::Summenstoerung);
readHoldingRegister(thing, modbus, slaveAddress, ModbusRegisterX2::LeistungKompressor);
readHoldingRegister(thing, modbus, slaveAddress, ModbusRegisterX2::LeistungWarmwasser);
readHoldingRegister(thing, modbus, slaveAddress, ModbusRegisterX2::LeistungRaumheizung);
readHoldingRegister(thing, modbus, slaveAddress, ModbusRegisterX2::LeistungLuftvorwaermung);
readHoldingRegister(thing, modbus, slaveAddress, ModbusRegisterX2::EnergieKompressor);
readHoldingRegister(thing, modbus, slaveAddress, ModbusRegisterX2::EnergieWarmwasser);
readHoldingRegister(thing, modbus, slaveAddress, ModbusRegisterX2::EnergieRaumheizung);
readHoldingRegister(thing, modbus, slaveAddress, ModbusRegisterX2::EnergieLuftvorerwarrmung);
readX2Power(thing, modbus, slaveAddress);
readX2Energy(thing, modbus, slaveAddress);
}
}
void IntegrationPluginDrexelUndWeiss::readX2Power(Thing *thing, ModbusRtuMaster *modbus, uint slaveAddress)
{
ModbusRtuReply *reply = modbus->readHoldingRegister(slaveAddress, ModbusRegisterX2::LeistungKompressor, 8);
connect(reply, &ModbusRtuReply::finished, reply, &ModbusRtuReply::deleteLater);
connect(reply, &ModbusRtuReply::finished, this, [reply, thing] {
if (reply->error() != ModbusRtuReply::Error::NoError) {
qCWarning(dcDrexelUndWeiss()) << "Modbus error" << reply->errorString();
return;
}
if (reply->result().length() != 8) {
return;
}
if (reply->registerAddress() != ModbusRegisterX2::LeistungKompressor) {
return;
}
//LeistungKompressor = 4000,
float value = (static_cast<uint32_t>(reply->result()[0])<<16 | reply->result()[1])/1000.00;
thing->setStateValue(x2wpPowerCompressorStateTypeId, value);
float totalPower = value;
//LeistungRaumheizung = 4002
value = (static_cast<uint32_t>(reply->result()[2])<<16 | reply->result()[3])/1000.00;
thing->setStateValue(x2wpPowerRoomHeatingStateTypeId, value);
//LeistungWarmwasser = 4004
value = (static_cast<uint32_t>(reply->result()[4])<<16 | reply->result()[5])/1000.00;
thing->setStateValue(x2wpPowerWaterHeatingStateTypeId, value);
//LeistungLuftvorerwarrmung = 4006
value = (static_cast<uint32_t>(reply->result()[6])<<16 | reply->result()[7])/1000.00;
thing->setStateValue(x2wpPowerAirPreheatingStateTypeId, value);
totalPower += value; //power compressor plus power air pre-heating
thing->setStateValue(x2wpCurrentPowerStateTypeId, totalPower);
});
}
void IntegrationPluginDrexelUndWeiss::readX2Energy(Thing *thing, ModbusRtuMaster *modbus, uint slaveAddress)
{
ModbusRtuReply *reply = modbus->readHoldingRegister(slaveAddress, ModbusRegisterX2::EnergieKompressor, 8);
connect(reply, &ModbusRtuReply::finished, reply, &ModbusRtuReply::deleteLater);
connect(reply, &ModbusRtuReply::finished, this, [reply, thing] {
if (reply->error() != ModbusRtuReply::Error::NoError) {
qCWarning(dcDrexelUndWeiss()) << "Modbus error" << reply->errorString();
return;
}
if (reply->result().length() != 8) {
return;
}
if (reply->registerAddress() != ModbusRegisterX2::EnergieKompressor) {
return;
}
//EnergieKompressor = 4500
float value = (static_cast<uint32_t>(reply->result()[0])<<16 | reply->result()[1])/1000.00;
thing->setStateValue(x2wpEnergyCompressorStateTypeId, value);
float totalEnergy = value;
//EnergieRaumheizung = 4502
value = (static_cast<uint32_t>(reply->result()[2])<<16 | reply->result()[3])/1000.00;
thing->setStateValue(x2wpEnergyRoomHeatingStateTypeId, value);
//EnergieWarmwasser = 4504
value = (static_cast<uint32_t>(reply->result()[4])<<16 | reply->result()[5])/1000.00;
thing->setStateValue(x2wpEnergyWaterHeatingStateTypeId, value);
//EnergieLuftvorerwarrmung = 4506
value = (static_cast<uint32_t>(reply->result()[6])<<16 | reply->result()[7])/1000.00;
thing->setStateValue(x2wpEnergyAirPreheatingStateTypeId, value);
totalEnergy += value; //energy compressor plus energy air pre-heating
thing->setStateValue(x2wpTotalEnergyConsumedStateTypeId, totalEnergy);
});
}
void IntegrationPluginDrexelUndWeiss::readHoldingRegister(Thing *thing, ModbusRtuMaster *modbus, uint slaveAddress, uint modbusRegister)
{
ModbusRtuReply *reply = modbus->readHoldingRegister(slaveAddress, modbusRegister, 2); // min 2 registers must be read
ModbusRtuReply *reply = modbus->readHoldingRegister(slaveAddress, modbusRegister); // min 2 registers must be read
connect(reply, &ModbusRtuReply::finished, reply, &ModbusRtuReply::deleteLater);
connect(reply, &ModbusRtuReply::finished, this, [reply, thing, this] {
if (reply->error() != ModbusRtuReply::Error::NoError) {
@ -479,36 +551,6 @@ void IntegrationPluginDrexelUndWeiss::readHoldingRegister(Thing *thing, ModbusRt
thing->setStateValue(x2wpErrorStateTypeId, "Supply air fan");
break;
case ModbusRegisterX2::LeistungKompressor:
thing->setStateValue(x2wpPowerCompressorStateTypeId, value/1000.00);
break;
case ModbusRegisterX2::LeistungWarmwasser:
thing->setStateValue(x2wpPowerWaterHeatingStateTypeId, value/1000.00);
break;
case ModbusRegisterX2::LeistungRaumheizung:
thing->setStateValue(x2wpPowerRoomHeatingStateTypeId, value/1000.00);
break;
case ModbusRegisterX2::LeistungLuftvorwaermung:
thing->setStateValue(x2wpPowerAirPreheatingStateTypeId, value/1000.00);
break;
case ModbusRegisterX2::EnergieKompressor:
thing->setStateValue(x2wpEnergyCompressorStateTypeId, value/1000.00);
break;
case ModbusRegisterX2::EnergieWarmwasser:
thing->setStateValue(x2wpEnergyWaterHeatingStateTypeId, value/1000.00);
break;
case ModbusRegisterX2::EnergieRaumheizung:
thing->setStateValue(x2wpEnergyRoomHeatingStateTypeId, value/1000.00);
break;
case ModbusRegisterX2::EnergieLuftvorerwarrmung:
thing->setStateValue(x2wpEnergyAirPreheatingStateTypeId, value/1000.00);
break;
default:
break;
}

5
drexelundweiss/integrationplugindrexelundweiss.h
View File

@ -1,6 +1,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Copyright 2013 - 2021, nymea GmbH
* Copyright 2013 - 2023, nymea GmbH
* Contact: contact@nymea.io
*
* This file is part of nymea.
@ -71,6 +71,9 @@ private:
VentilationMode getVentilationModeFromString(const QString &modeString);
void readX2Energy(Thing *thing, ModbusRtuMaster *modbus, uint slaveAddress);
void readX2Power(Thing *thing, ModbusRtuMaster *modbus, uint slaveAddress);
private slots:
void onRefreshTimer();
void onPluginConfigurationChanged(const ParamTypeId &paramTypeId, const QVariant &value);

21
drexelundweiss/integrationplugindrexelundweiss.json
View File

@ -114,7 +114,7 @@
"displayName": "X2 WP",
"id": "e548f962-92db-4110-8279-10fbcde35f93",
"createMethods": ["discovery"],
"interfaces": ["thermostat", "connectable"],
"interfaces": ["thermostat", "smartmeterconsumer", "connectable"],
"discoveryParamTypes": [
{
"id": "d4923c90-22c8-477e-a37a-341858e59dcb",
@ -152,6 +152,7 @@
"type": "bool",
"defaultValue": false
},
{
"id": "f2ce8389-c33f-4f10-8484-f2e993841762",
"name": "power",
@ -268,6 +269,15 @@
"Supply air fan"
]
},
{
"id": "c969ece8-4712-4728-b895-2901dcdb346b",
"name": "currentPower",
"displayName": "Total power consumption",
"displayNameEvent": "Total ower consumption changed",
"type": "double",
"unit": "Watt",
"defaultValue": 0
},
{
"id": "7287943a-ea6d-4c92-abbd-f55f6c7ee9e5",
"name": "powerCompressor",
@ -304,6 +314,15 @@
"unit": "Watt",
"defaultValue": 0
},
{
"id": "812d931b-df7d-4e6a-a53a-da84535bfffa",
"name": "totalEnergyConsumed",
"displayName": "Total energy",
"displayNameEvent": "Total energy changed",
"type": "double",
"unit": "KiloWattHour",
"defaultValue": 0
},
{
"id": "b423657b-4e59-41cd-89a3-4f5cb1c3a271",
"name": "energyCompressor",

2
drexelundweiss/modbusregisterdefinition.h
View File

@ -1,6 +1,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Copyright 2013 - 2021, nymea GmbH
* Copyright 2013 - 2023, nymea GmbH
* Contact: contact@nymea.io
*
* This file is part of nymea.