From 64616a0c5529fe397e1937a0facd24c32580010f Mon Sep 17 00:00:00 2001 From: lsiepel Date: Fri, 28 Feb 2025 14:46:44 +0100 Subject: [PATCH] [plugwiseha] Use system channel types (#18325) Signed-off-by: Leo Siepel --- .../OH-INF/i18n/plugwiseha.properties | 14 ++++-- .../main/resources/OH-INF/thing/channels.xml | 29 ------------ .../resources/OH-INF/thing/thing-types.xml | 38 ++++++++++++--- .../resources/OH-INF/update/instructions.xml | 47 +++++++++++++++++++ 4 files changed, 88 insertions(+), 40 deletions(-) diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/i18n/plugwiseha.properties b/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/i18n/plugwiseha.properties index 4c875dfc0e3..96d763431bd 100644 --- a/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/i18n/plugwiseha.properties +++ b/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/i18n/plugwiseha.properties @@ -9,14 +9,23 @@ thing-type.plugwiseha.appliance_boiler.label = Boiler thing-type.plugwiseha.appliance_boiler.description = A Plugwise Home Automation controlled boiler thing-type.plugwiseha.appliance_pump.label = Central Heating Pump thing-type.plugwiseha.appliance_pump.description = A Plugwise Home Automation smart plug switch connected to a central heating pump +thing-type.plugwiseha.appliance_pump.channel.power.label = Power +thing-type.plugwiseha.appliance_pump.channel.power.description = Switch the Plugwise Smart plug ON or OFF +thing-type.plugwiseha.appliance_pump.channel.powerUsage.label = Power Usage thing-type.plugwiseha.appliance_thermostat.label = Plugwise Room Thermostat thing-type.plugwiseha.appliance_thermostat.description = A Plugwise Home Automation room thermostat +thing-type.plugwiseha.appliance_thermostat.channel.temperature.label = Zone Temperature +thing-type.plugwiseha.appliance_thermostat.channel.temperature.description = Gets the temperature of this zone thing-type.plugwiseha.appliance_valve.label = Plugwise Radiator Valve thing-type.plugwiseha.appliance_valve.description = A Plugwise Home Automation radiator valve +thing-type.plugwiseha.appliance_valve.channel.temperature.label = Zone Temperature +thing-type.plugwiseha.appliance_valve.channel.temperature.description = Gets the temperature of this zone thing-type.plugwiseha.gateway.label = Plugwise Home Automation Bridge thing-type.plugwiseha.gateway.description = The Plugwise Home Automation Bridge is needed to connect to the Adam boiler gateway thing-type.plugwiseha.zone.label = Plugwise Zone thing-type.plugwiseha.zone.description = A Plugwise Home Automation heating zone +thing-type.plugwiseha.zone.channel.temperature.label = Zone Temperature +thing-type.plugwiseha.zone.channel.temperature.description = Gets the temperature of this zone # thing types config @@ -89,9 +98,6 @@ channel-type.plugwiseha.otAppFaultCode.label = Opentherm Application Faultcode channel-type.plugwiseha.otAppFaultCode.description = Gets the Opentherm application fault code of this boiler channel-type.plugwiseha.otOEMFaultCode.label = OEM Fault Code channel-type.plugwiseha.otOEMFaultCode.description = Gets the OEM fault code of this boiler -channel-type.plugwiseha.power.label = Power -channel-type.plugwiseha.power.description = Switch the Plugwise Smart plug ON or OFF -channel-type.plugwiseha.powerUsage.label = Power Usage channel-type.plugwiseha.preHeat.label = Preheat channel-type.plugwiseha.preHeat.description = Switch the preheating of a zone ON or OFF channel-type.plugwiseha.presetScene.label = Preset Scene @@ -110,8 +116,6 @@ channel-type.plugwiseha.returnWaterTemperature.label = Return Water Temperature channel-type.plugwiseha.returnWaterTemperature.description = Gets the temperature of the return water channel-type.plugwiseha.setpointTemperature.label = Setpoint Temperature channel-type.plugwiseha.setpointTemperature.description = Gets or sets the set point of this zone -channel-type.plugwiseha.temperature.label = Zone Temperature -channel-type.plugwiseha.temperature.description = Gets the temperature of this zone channel-type.plugwiseha.valvePosition.label = Valve Position channel-type.plugwiseha.valvePosition.description = Gets the position of the valve (0% closed, 100% open) channel-type.plugwiseha.waterPressure.label = Water Pressure diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/thing/channels.xml index 6ffe8128029..20668e9d0ea 100644 --- a/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/thing/channels.xml +++ b/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/thing/channels.xml @@ -16,18 +16,6 @@ - - Number:Temperature - - Gets the temperature of this zone - heating - - Measurement - Temperature - - - - Number:Temperature @@ -64,13 +52,6 @@ - - Switch - - Switch the Plugwise Smart plug ON or OFF - switch - - Switch @@ -78,16 +59,6 @@ switch - - Number:Power - - - Measurement - Power - - - - Switch diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/thing/thing-types.xml index 8b922919ffd..e4dcbb20138 100644 --- a/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/thing/thing-types.xml @@ -65,13 +65,20 @@ - + + + Gets the temperature of this zone + + + 1 + + id @@ -88,12 +95,15 @@ - + + + Gets the temperature of this zone + - 1 + 2 id @@ -111,11 +121,20 @@ A Plugwise Home Automation smart plug switch connected to a central heating pump - + + + Switch the Plugwise Smart plug ON or OFF + - + + + + + 1 + + id @@ -132,10 +151,17 @@ - + + + Gets the temperature of this zone + + + 1 + + id diff --git a/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/update/instructions.xml b/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/update/instructions.xml index 7442a98757b..3ec39ba3967 100644 --- a/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/update/instructions.xml +++ b/bundles/org.openhab.binding.plugwiseha/src/main/resources/OH-INF/update/instructions.xml @@ -28,6 +28,18 @@ + + + + + system:indoor-temperature + + Gets the temperature of this zone + + + + + @@ -36,5 +48,40 @@ + + + system:indoor-temperature + + Gets the temperature of this zone + + + + + + + + + system:power + + Switch the pump ON or OFF + + + system:electric-power + + + + + + + + + + + system:indoor-temperature + + Gets the temperature of this zone + + +