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

Added power consumption of heat pump

master
Hermann Detz 2020-10-16 16:18:18 +02:00 committed by Michael Zanetti
parent 68dd60ba77
commit c6ca132713
5 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
idm/idm.cpp
View File

@ -104,6 +104,18 @@ void Idm::onReceivedHoldingRegister(int slaveAddress, int modbusRegister, const
if (value.length() == 2) { if (value.length() == 2) {
m_info->m_roomTemperature = ModbusHelpers::convertRegisterToFloat(&value[RegisterList::RoomTemperatureHKA - modbusRegister]); m_info->m_roomTemperature = ModbusHelpers::convertRegisterToFloat(&value[RegisterList::RoomTemperatureHKA - modbusRegister]);
} }
m_modbusMaster->readHoldingRegister(Idm::ModbusUnitID, Idm::RoomTemperatureTargetHeatingHKA, 2);
break;
case Idm::RoomTemperatureTargetHeatingHKA:
if (value.length() == 2) {
m_info->m_targetRoomTemperature = ModbusHelpers::convertRegisterToFloat(&value[RegisterList::RoomTemperatureTargetHeatingHKA - modbusRegister]);
}
m_modbusMaster->readHoldingRegister(Idm::ModbusUnitID, Idm::CurrentPowerConsumptionHeatPump, 2);
break;
case Idm::CurrentPowerConsumptionHeatPump:
if (value.length() == 2) {
m_info->m_powerConsumptionHeatPump = ModbusHelpers::convertRegisterToFloat(&value[RegisterList::CurrentPowerConsumptionHeatPump - modbusRegister]);
}
/* Everything read without an error /* Everything read without an error
* -> set connected to true */ * -> set connected to true */

2
idm/idm.h
View File

@ -130,7 +130,7 @@ private:
TargetRoomTemperatureZ1R1 = 2004, // Zonenmodul 1 Raumsolltemperatur Raum 1 TargetRoomTemperatureZ1R1 = 2004, // Zonenmodul 1 Raumsolltemperatur Raum 1
CurrentPhotovoltaicsSurplus = 74, // Aktueller PV-Überschuss CurrentPhotovoltaicsSurplus = 74, // Aktueller PV-Überschuss
CurrentPhotovoltaicsProduction = 78, // Aktueller PV Produktion CurrentPhotovoltaicsProduction = 78, // Aktueller PV Produktion
CurrentPowerConsumption = 4122, // Aktuelle Leistungsaufnahme Wärmepumpe CurrentPowerConsumptionHeatPump = 4122, // Aktuelle Leistungsaufnahme Wärmepumpe
}; };
/* Note: This class only requires one IP address and one /* Note: This class only requires one IP address and one

3
idm/idminfo.h
View File

@ -62,6 +62,9 @@ struct IdmInfo {
/** RegisterList::HumiditySensor */ /** RegisterList::HumiditySensor */
double m_humidity; double m_humidity;
/** RegisterList::CurrentPowerConsumptionHeatPump */
double m_powerConsumptionHeatPump;
/** RegisterList::OperationModeSystem */ /** RegisterList::OperationModeSystem */
QString m_mode; QString m_mode;

1
idm/integrationpluginidm.cpp
View File

@ -155,6 +155,7 @@ void IntegrationPluginIdm::onStatusUpdated(IdmInfo *info)
thing->setStateValue(navigator2TargetTemperatureStateTypeId, info->m_targetRoomTemperature); thing->setStateValue(navigator2TargetTemperatureStateTypeId, info->m_targetRoomTemperature);
thing->setStateValue(navigator2TargetWaterTemperatureStateTypeId, info->m_targetWaterTemperature); thing->setStateValue(navigator2TargetWaterTemperatureStateTypeId, info->m_targetWaterTemperature);
thing->setStateValue(navigator2HumidityStateTypeId, info->m_humidity); thing->setStateValue(navigator2HumidityStateTypeId, info->m_humidity);
thing->setStateValue(navigator2CurrentPowerConsumptionHeatPumpStateTypeId, info->m_powerConsumptionHeatPump);
thing->setStateValue(navigator2ModeStateTypeId, info->m_mode); thing->setStateValue(navigator2ModeStateTypeId, info->m_mode);
thing->setStateValue(navigator2ErrorStateTypeId, info->m_error); thing->setStateValue(navigator2ErrorStateTypeId, info->m_error);
} }

10
idm/integrationpluginidm.json
View File

@ -105,6 +105,16 @@
"defaultValue": 46.00, "defaultValue": 46.00,
"writable": true "writable": true
}, },
{
"id": "b98fb325-100d-4eae-bf8d-97e8f7e1eb00",
"name": "currentPowerConsumptionHeatPump",
"displayName": "Current power consumption heat pump",
"displayNameEvent": "Current power consumption heat pump changed",
"displayNameAction": "Change current power consumption het pump",
"type": "double",
"defaultValue": 0
},
{ {
"id": "e539366b-44da-4119-b11b-497bcdb1f522", "id": "e539366b-44da-4119-b11b-497bcdb1f522",
"name": "mode", "name": "mode",