From ef183285295c719491912987378bfe9120c9b226 Mon Sep 17 00:00:00 2001 From: Hermann Detz Date: Fri, 16 Oct 2020 17:54:12 +0200 Subject: [PATCH] Corrected units and state names --- idm/idm.cpp | 1 + idm/integrationpluginidm.json | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/idm/idm.cpp b/idm/idm.cpp index 0c6a7aa..cf3156c 100644 --- a/idm/idm.cpp +++ b/idm/idm.cpp @@ -84,6 +84,7 @@ void Idm::onReceivedHoldingRegister(int slaveAddress, int modbusRegister, const break; case Idm::TargetHotWaterTemperature: if (value.length() == 1) { + /* The hot water target temperature is stored as UCHAR (manual p. 13) */ m_info->m_targetWaterTemperature = (double)value[RegisterList::TargetHotWaterTemperature - modbusRegister]; } m_modbusMaster->readHoldingRegister(Idm::ModbusUnitID, Idm::HeatPumpOperatingMode, 1); diff --git a/idm/integrationpluginidm.json b/idm/integrationpluginidm.json index 5292ce0..984d7e0 100644 --- a/idm/integrationpluginidm.json +++ b/idm/integrationpluginidm.json @@ -76,6 +76,7 @@ "displayNameEvent": "Humidity changed", "type": "double", "defaultValue": 0, + "unit": "Percentage", "minValue": 0, "maxValue": 100 }, @@ -113,6 +114,7 @@ "displayNameEvent": "Current power consumption heat pump changed", "displayNameAction": "Change current power consumption het pump", "type": "double", + "unit": "KiloWatt", "defaultValue": 0 }, { @@ -162,8 +164,8 @@ "paramTypes" : [ { "id": "034b9a8c-1a5a-45da-8422-393273d0a159", - "name": "humidity", - "displayName": "humidity", + "name": "extHumidity", + "displayName": "External Humidity", "type": "int", "defaultValue": 0, "minValue": 0, @@ -174,13 +176,13 @@ }, { "id": "87633d1f-3826-4bf0-9a2c-46a927446eb5", - "name": "pvEnergy", - "displayName": "Set available PV Energy", + "name": "pvPower", + "displayName": "Set available PV Power", "paramTypes" : [ { "id": "84b251ab-33b5-45e5-9a5c-468e3affe821", - "name": "energy", - "displayName": "Energy", + "name": "pvPower", + "displayName": "PV Power", "type": "double", "defaultValue": 0.00, "minValue": 0.00,