[ecotouch] Add water and heating power limit channels (#16446)

* limit power compressor flags for water and heating

Signed-off-by: tobiroemer <bitbucket.org@t-obias.de>

diff --git a/bundles/org.openhab.binding.ecotouch/README.md b/bundles/org.openhab.binding.ecotouch/README.md
index 16d77834d3dc5056aa3d829fc1b773a1a619ebaa..f31e068b3c1255888ddb77b5bd8848ab3932f7f4 100644 (file)
--- 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 f7aa6b4a431dc9f0ecd4e509d9db95dec802fd2b..1fff3d15c017d2f851581c7e0e6ebb4bb392cef8 100644 (file)
--- 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 1e4f2286e402efb4001809c7fa8dc58d850c0f81..5156960a67936a9ca385681ac098e43fe98fad0a 100644 (file)
--- 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 91ec05504bf5cc861380bd76256a7cea8041cc0e..34d3c1be2e7a655b59d1e70696ab4d44367069e0 100644 (file)
--- 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 @@
                        <channel id="manual_coolvalve" typeId="manual_coolvalve"/>
                        <channel id="manual_4wayvalve" typeId="manual_4wayvalve"/>
                        <channel id="manual_multiext" typeId="manual_multiext"/>
+                       <channel id="percent_water_limit_min" typeId="percent_water_limit_min"/>
+                       <channel id="percent_water_limit_max" typeId="percent_water_limit_max"/>
+                       <channel id="percent_heating_limit_min" typeId="percent_heating_limit_min"/>
+                       <channel id="percent_heating_limit_max" typeId="percent_heating_limit_max"/>
 
                        <channel id="ecovent_temp_exhaust_air" typeId="ecovent_temp_exhaust_air"/>
                        <channel id="ecovent_temp_exit_air" typeId="ecovent_temp_exit_air"/>
@@ -256,6 +260,11 @@
                        <channel id="temperature_suction_air" typeId="temperature_suction_air"/>
                        <channel id="temperature_sump" typeId="temperature_sump"/>
 
+                       <channel id="percent_water_limit_min" typeId="percent_water_limit_min"/>
+                       <channel id="percent_water_limit_max" typeId="percent_water_limit_max"/>
+                       <channel id="percent_heating_limit_min" typeId="percent_heating_limit_min"/>
+                       <channel id="percent_heating_limit_max" typeId="percent_heating_limit_max"/>
+
                        <channel id="ecovent_temp_exhaust_air" typeId="ecovent_temp_exhaust_air"/>
                        <channel id="ecovent_temp_exit_air" typeId="ecovent_temp_exit_air"/>
                        <channel id="ecovent_temp_outdoor_air" typeId="ecovent_temp_outdoor_air"/>
@@ -888,7 +897,26 @@
                <category>Temperature</category>
                <state readOnly="true" pattern="%.1f %unit%"/>
        </channel-type>
-
+       <channel-type id="percent_water_limit_min" advanced="true">
+               <item-type>Number:Dimensionless</item-type>
+               <label>Water Powerlimit Min</label>
+               <state readOnly="false" pattern="%.1f %unit%"/>
+       </channel-type>
+       <channel-type id="percent_water_limit_max" advanced="true">
+               <item-type>Number:Dimensionless</item-type>
+               <label>Water Powerlimit Max</label>
+               <state readOnly="false" pattern="%.1f %unit%"/>
+       </channel-type>
+       <channel-type id="percent_heating_limit_min" advanced="true">
+               <item-type>Number:Dimensionless</item-type>
+               <label>Heating Powerlimit Min</label>
+               <state readOnly="false" pattern="%.1f %unit%"/>
+       </channel-type>
+       <channel-type id="percent_heating_limit_max" advanced="true">
+               <item-type>Number:Dimensionless</item-type>
+               <label>Heating Powerlimit Max</label>
+               <state readOnly="false" pattern="%.1f %unit%"/>
+       </channel-type>
        <!-- The following tags are only available, if an Ecovent System is attached to the Ecotouch -->
        <channel-type id="ecovent_temp_exhaust_air">
                <item-type>Number:Temperature</item-type>

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 (file)
index 0000000..abe8075
--- /dev/null
+++ b/bundles/org.openhab.binding.ecotouch/src/main/resources/OH-INF/update/instructions.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<update:update-descriptions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:update="https://openhab.org/schemas/update-description/v1.0.0"
+       xsi:schemaLocation="https://openhab.org/schemas/update-description/v1.0.0 https://openhab.org/schemas/update-description-1.0.0.xsd">
+
+       <thing-type uid="ecotouch:geo">
+               <properties>
+                       <property name="thingTypeVersion">1</property>
+               </properties>
+               <instruction-set targetVersion="1">
+                       <add-channel id="percent_water_limit_min">
+                               <type>Number:Dimensionless</type>
+                       </add-channel>
+                       <add-channel id="percent_water_limit_max">
+                               <type>Number:Dimensionless</type>
+                       </add-channel>
+                       <add-channel id="percent_heating_limit_min">
+                               <type>Number:Dimensionless</type>
+                       </add-channel>
+                       <add-channel id="percent_heating_limit_max">
+                               <type>Number:Dimensionless</type>
+                       </add-channel>
+               </instruction-set>
+       </thing-type>
+
+       <thing-type uid="ecotouch:air">
+               <properties>
+                       <property name="thingTypeVersion">1</property>
+               </properties>
+               <instruction-set targetVersion="1">
+                       <add-channel id="percent_water_limit_min">
+                               <type>Number:Dimensionless</type>
+                       </add-channel>
+                       <add-channel id="percent_water_limit_max">
+                               <type>Number:Dimensionless</type>
+                       </add-channel>
+                       <add-channel id="percent_heating_limit_min">
+                               <type>Number:Dimensionless</type>
+                       </add-channel>
+                       <add-channel id="percent_heating_limit_max">
+                               <type>Number:Dimensionless</type>
+                       </add-channel>
+               </instruction-set>
+       </thing-type>
+
+</update:update-descriptions>