diff --git a/drexelundweiss/integrationplugindrexelundweiss.cpp b/drexelundweiss/integrationplugindrexelundweiss.cpp index 4ce0f39..95758ef 100644 --- a/drexelundweiss/integrationplugindrexelundweiss.cpp +++ b/drexelundweiss/integrationplugindrexelundweiss.cpp @@ -209,18 +209,7 @@ void IntegrationPluginDrexelUndWeiss::executeAction(ThingActionInfo *info) } else if (thing->thingClassId() == x2wpThingClassId) { uint slaveAddress = thing->paramValue(x2wpThingSlaveAddressParamTypeId).toUInt(); - if (action.actionTypeId() == x2wpPowerActionTypeId) { - bool power = action.paramValue(x2wpPowerActionPowerParamTypeId).toBool(); - uint32_t data = 0; - if (power) { - double targetTemp = thing->stateValue(x2wpTargetTemperatureActionTargetTemperatureParamTypeId).toDouble(); - data = static_cast(qRound(targetTemp * 1000)); - } else { - data = 18 * 1000; //set to min temperature - } - sendWriteRequest(info, slaveAddress, ModbusRegisterX2::RaumSoll, data); - - } else if (action.actionTypeId() == x2wpTargetTemperatureActionTypeId) { + if (action.actionTypeId() == x2wpTargetTemperatureActionTypeId) { double targetTemp = (action.param(x2wpTargetTemperatureActionTargetTemperatureParamTypeId).value().toDouble()); uint32_t data = static_cast(qRound(targetTemp * 1000)); sendWriteRequest(info, slaveAddress, ModbusRegisterX2::RaumSoll, data); @@ -381,7 +370,7 @@ void IntegrationPluginDrexelUndWeiss::readHoldingRegister(Thing *thing, ModbusRt if (value != 0) { //get actual error } else { - thing->setStateValue(x2wpErrorStateTypeId, "No Error"); + thing->setStateValue(x2wpErrorStateTypeId, "No error"); } break; diff --git a/drexelundweiss/integrationplugindrexelundweiss.json b/drexelundweiss/integrationplugindrexelundweiss.json index 43e4161..88528e2 100644 --- a/drexelundweiss/integrationplugindrexelundweiss.json +++ b/drexelundweiss/integrationplugindrexelundweiss.json @@ -112,7 +112,7 @@ "displayName": "X2 WP", "id": "e548f962-92db-4110-8279-10fbcde35f93", "createMethods": ["discovery"], - "interfaces": ["thermostat", "heating", "temperaturesensor", "connectable"], + "interfaces": ["thermostat", "connectable"], "discoveryParamTypes": [ { "id": "d4923c90-22c8-477e-a37a-341858e59dcb", @@ -155,10 +155,8 @@ "name": "power", "displayName": "Power", "displayNameEvent": "Power changed", - "displayNameAction": "Change power", "type": "bool", - "defaultValue": false, - "writable": true + "defaultValue": false }, { "id": "3ab2d609-1686-4fd7-84e3-580c8e0537d0",