From fb26d0ee18dd51d5645afbc5bc238959e48f70d4 Mon Sep 17 00:00:00 2001 From: troem <34965481+troem@users.noreply.github.com> Date: Mon, 4 Mar 2024 18:58:40 +0100 Subject: [PATCH] [ecotouch] Add water and heating power limit channels (#16446) * limit power compressor flags for water and heating Signed-off-by: tobiroemer --- .../org.openhab.binding.ecotouch/README.md | 4 ++ .../ecotouch/internal/EcoTouchTags.java | 36 +++++++++++++++ .../resources/OH-INF/i18n/ecotouch.properties | 11 +++++ .../resources/OH-INF/thing/thing-types.xml | 30 +++++++++++- .../resources/OH-INF/update/instructions.xml | 46 +++++++++++++++++++ 5 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/update/instructions.xml diff --git a/bundles/org.openhab.binding.ecotouch/README.md b/bundles/org.openhab.binding.ecotouch/README.md index 16d77834d3dc5..f31e068b3c125 100644 --- a/bundles/org.openhab.binding.ecotouch/README.md +++ b/bundles/org.openhab.binding.ecotouch/README.md @@ -131,6 +131,10 @@ Advanced channels: | temperature_storage | Number:Temperature | yes | Temperature Storage | | temperature_suction | Number:Temperature | yes | Temperature Suction | | temperature_water_set | Number:Temperature | yes | Temperature Water Setpoint | +| percent_water_limit_min | Number:Dimensionless | no | Percent Water Power limit Min | +| percent_water_limit_max | Number:Dimensionless | no | Percent Water Power limit Max | +| percent_heating_limit_min | Number:Dimensionless | no | Percent Heating Power limit Min | +| percent_heating_limit_max | Number:Dimensionless | no | Percent Heating Power limit Min | | time_hour | Number:Dimensionless | yes | Hour | | time_minute | Number:Dimensionless | yes | Minute | | version_bios | Number:Dimensionless | yes | Version BIOS | diff --git a/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchTags.java b/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchTags.java index f7aa6b4a431dc..1fff3d15c017d 100644 --- a/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchTags.java +++ b/bundles/org.openhab.binding.ecotouch/src/main/java/org/openhab/binding/ecotouch/internal/EcoTouchTags.java @@ -1030,6 +1030,42 @@ public enum EcoTouchTags { } }, + // German: % Leistungsbegrenzung Min Ausgang + TYPE_PRECENT_WATER_LIMIT_MIN { + { + command = "percent_water_limit_min"; + unit = PERCENT; + tagName = "A172"; + } + }, + + // German: % Leistungsbegrenzung Max Ausgang + TYPE_PRECENT_WATER_LIMIT_MAX { + { + command = "percent_water_limit_max"; + unit = PERCENT; + tagName = "A171"; + } + }, + + // German: % Heizung Leistungsbegrenzung Min Ausgang + TYPE_PRECENT_HEATING_LIMIT_MIN { + { + command = "percent_heating_limit_min"; + unit = PERCENT; + tagName = "A505"; + } + }, + + // German: % Heizung Leistungsbegrenzung Max Ausgang + TYPE_PRECENT_HEATING_LIMIT_MAX { + { + command = "percent_heating_limit_max"; + unit = PERCENT; + tagName = "A504"; + } + }, + // // The following tags are only available, if an Ecovent System is attached to the Ecotouch // diff --git a/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/i18n/ecotouch.properties b/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/i18n/ecotouch.properties index 1e4f2286e402e..5156960a67936 100644 --- a/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/i18n/ecotouch.properties +++ b/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/i18n/ecotouch.properties @@ -101,7 +101,11 @@ channel-type.ecotouch.operating_hours_source_pump.description = Operating Hours channel-type.ecotouch.percent_compressor.label = Percent Compressor channel-type.ecotouch.percent_heat_circ_pump.label = Percent Circulation Pump channel-type.ecotouch.percent_heat_circ_pump.description = Percent Heating Circulation Pump +channel-type.ecotouch.percent_heating_limit_max.label = Heating Powerlimit Max +channel-type.ecotouch.percent_heating_limit_min.label = Heating Powerlimit Min channel-type.ecotouch.percent_source_pump.label = Percent Source Pump +channel-type.ecotouch.percent_water_limit_max.label = Water Powerlimit Max +channel-type.ecotouch.percent_water_limit_min.label = Water Powerlimit Min channel-type.ecotouch.position_expansion_valve.label = Position Expansion Valve channel-type.ecotouch.power_compressor.label = Power Compressor channel-type.ecotouch.power_cooling.label = Power Cooling @@ -186,3 +190,10 @@ channel-type.ecotouch.version_controller.label = Version Controller channel-type.ecotouch.version_controller.description = Version Display Controller channel-type.ecotouch.version_controller_build.label = Build Number Controller channel-type.ecotouch.version_controller_build.description = Build Number Display Controller + +# channel types + +channel-type.ecotouch.percent_water_limit_min.description = Water limit power percentage min +channel-type.ecotouch.percent_water_limit_max.description = Water limit power percentage max +channel-type.ecotouch.percent_heating_limit_min.description = Heating limit power percentage min +channel-type.ecotouch.percent_heating_limit_max.description = Heating limit power percentage max diff --git a/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/thing/thing-types.xml index 91ec05504bf5c..34d3c1be2e7a6 100644 --- a/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/thing/thing-types.xml @@ -109,6 +109,10 @@ + + + + @@ -256,6 +260,11 @@ + + + + + @@ -888,7 +897,26 @@ Temperature - + + Number:Dimensionless + + + + + Number:Dimensionless + + + + + Number:Dimensionless + + + + + Number:Dimensionless + + + Number:Temperature diff --git a/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/update/instructions.xml b/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/update/instructions.xml new file mode 100644 index 0000000000000..abe8075060881 --- /dev/null +++ b/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/update/instructions.xml @@ -0,0 +1,46 @@ + + + + + + 1 + + + + Number:Dimensionless + + + Number:Dimensionless + + + Number:Dimensionless + + + Number:Dimensionless + + + + + + + 1 + + + + Number:Dimensionless + + + Number:Dimensionless + + + Number:Dimensionless + + + Number:Dimensionless + + + + +