[nibeheatpump] Added new channels for F1x45 heat pumps (#13125)

* [nibeheatpump] Added new channels for F1x45 heat pumps

 - Reset Alarms channel
 - 32bit Degree Minutes channel

Signed-off-by: Pauli Anttila <pauli.anttila@gmail.com>

diff --git a/bundles/org.openhab.binding.nibeheatpump/README.md b/bundles/org.openhab.binding.nibeheatpump/README.md
index 2966a7e00b153184c340071890bdd6de70f35194..2352f6470dac87475e61483a23fd37ff75a3603f 100644 (file)
--- a/bundles/org.openhab.binding.nibeheatpump/README.md
+++ b/bundles/org.openhab.binding.nibeheatpump/README.md
@@ -229,6 +229,7 @@ This binding currently supports following channels for F1x45 pump models:
 | 40129           | Number    | -32767      | 32767      | Setting | EP21-BT3 Return temp S2                                  |                                                                                                                                                                    |
 | 40155           | Number    | -32767      | 32767      | Setting | EQ1-BT57 Collector temp.                                 |                                                                                                                                                                    |
 | 40156           | Number    | -32767      | 32767      | Setting | EQ1-BT75 Heatdump temp.                                  |                                                                                                                                                                    |
+| 40940           | Number    | -30000      | 30000      | Setting | Degree Minutes (32 bit)                                  |                                                                                                                                                                    |
 | 43001           | Number    | 0           | 65535      | Setting | Software version                                         |                                                                                                                                                                    |
 | 43005           | Number    | -30000      | 30000      | Setting | Degree Minutes                                           |                                                                                                                                                                    |
 | 43006           | Number    | -32767      | 32767      | Setting | Calculated Supply Temperature S4                         |                                                                                                                                                                    |
@@ -678,6 +679,7 @@ This binding currently supports following channels for F1x45 pump models:
 | 44911           | Number    | -32767      | 32767      | Setting | Brine pump  dT act.                                      |                                                                                                                                                                    |
 | 44912           | Switch    | 0           | 1          | Sensor  | Brine pump auto controlled                               |                                                                                                                                                                    |
 | 45001           | Number    | -32767      | 32767      | Sensor  | Alarm Number                                             |                                                                                                                                                                    |
+| 45171           | Number    | 0           | 255        | Setting | Alarm Reset                                              |                                                                                                                                                                    |
 | 47291           | Number    | 0           | 10000      | Sensor  | Floor drying timer                                       |                                                                                                                                                                    |
 | 47325           | Number    | 0           | 7          | Sensor  | Step controlled add. max. step                           |                                                                                                                                                                    |
 | 47004           | Number    | 0           | 15         | Sensor  | Heat curve S4                                            |                                                                                                                                                                    |

diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F1X45.java b/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F1X45.java
index 5dc9aa3224f3a1cb015555bed2b2db2245cddbcc..a6956a118a246f2d2ab5e0f72d5369b4c8c0d642 100644 (file)
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F1X45.java
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F1X45.java
@@ -86,6 +86,7 @@ public class F1X45 {
                     put(40129, new VariableInformation(  10, NibeDataType.S16, Type.SENSOR  , "EP21-BT3 Return temp S2"));
                     put(40155, new VariableInformation(  10, NibeDataType.S16, Type.SENSOR  , "EQ1-BT57 Collector temp."));
                     put(40156, new VariableInformation(  10, NibeDataType.S16, Type.SENSOR  , "EQ1-BT75 Heatdump temp."));
+                    put(40940, new VariableInformation(  10, NibeDataType.S32, Type.SETTING , "Degree Minutes (32 bit)"));
                     put(43001, new VariableInformation(   1, NibeDataType.U16, Type.SENSOR  , "Software version"));
                     put(43005, new VariableInformation(  10, NibeDataType.S16, Type.SETTING , "Degree Minutes"));
                     put(43006, new VariableInformation(  10, NibeDataType.S16, Type.SENSOR  , "Calculated Supply Temperature S4"));
@@ -535,6 +536,7 @@ public class F1X45 {
                     put(44911, new VariableInformation(  10, NibeDataType.S16, Type.SENSOR  , "Brine pump  dT act."));
                     put(44912, new VariableInformation(   1, NibeDataType.S8 , Type.SENSOR  , "Brine pump auto controlled"));
                     put(45001, new VariableInformation(   1, NibeDataType.S16, Type.SENSOR  , "Alarm Number"));
+                    put(45171, new VariableInformation(   1, NibeDataType.U8 , Type.SETTING , "Alarm Reset"));
                     put(47291, new VariableInformation(   1, NibeDataType.U16, Type.SENSOR  , "Floor drying timer"));
                     put(47325, new VariableInformation(   1, NibeDataType.U8 , Type.SENSOR  , "Step controlled add. max. step"));
                     put(47004, new VariableInformation(   1, NibeDataType.S8 , Type.SETTING , "Heat curve S4"));

diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/i18n/nibeheatpump.properties b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/i18n/nibeheatpump.properties
index cb1dd7530dd4e115bc0a82e49a1af06937d0d0da..f7b92b550aeca3463b8e361c74b842f7ae1c4c84 100644 (file)
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/i18n/nibeheatpump.properties
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/i18n/nibeheatpump.properties
@@ -345,6 +345,8 @@ channel-type.nibeheatpump.f1x45-40155.label = EQ1-BT57 Collector Temp.
 channel-type.nibeheatpump.f1x45-40155.description = External collector temperature for ACS
 channel-type.nibeheatpump.f1x45-40156.label = EQ1-BT75 Heatdump Temp.
 channel-type.nibeheatpump.f1x45-40156.description = Heating medium dump temperature for ACS
+channel-type.nibeheatpump.f1x45-40940.label = Degree Minutes (32 Bit)
+channel-type.nibeheatpump.f1x45-40940.description = Degree minutes, 32bit value. Full resolution.
 channel-type.nibeheatpump.f1x45-43001.label = Software Version
 channel-type.nibeheatpump.f1x45-43005.label = Degree Minutes
 channel-type.nibeheatpump.f1x45-43006.label = Calculated Supply Temperature S4
@@ -1002,6 +1004,8 @@ channel-type.nibeheatpump.f1x45-44912.label = Brine Pump Auto Controlled
 channel-type.nibeheatpump.f1x45-44912.description = Brine pump auto controlled
 channel-type.nibeheatpump.f1x45-45001.label = Alarm Number
 channel-type.nibeheatpump.f1x45-45001.description = The value indicates the most severe current alarm
+channel-type.nibeheatpump.f1x45-45171.label = Alarm Reset
+channel-type.nibeheatpump.f1x45-45171.description = Reset alarm by setting value 1
 channel-type.nibeheatpump.f1x45-47004.label = Heat Curve S4
 channel-type.nibeheatpump.f1x45-47004.description = Heat curve to use see manual for the different curves.
 channel-type.nibeheatpump.f1x45-47005.label = Heat Curve S3

diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f1x45-channel-groups.xml b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f1x45-channel-groups.xml
index 681e558d12adbb0705dcd8919285c56d51df8b82..c82ad1372e55e1fff329b82d438bf3e8282d7663 100644 (file)
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f1x45-channel-groups.xml
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f1x45-channel-groups.xml
@@ -516,8 +516,10 @@
        <channel-group-type id="f1x45-setting-group-channels">
                <label>Settings</label>
                <channels>
+                       <channel id="40940" typeId="f1x45-40940"/>
                        <channel id="43005" typeId="f1x45-43005"/>
                        <channel id="44266" typeId="f1x45-44266"/>
+                       <channel id="45171" typeId="f1x45-45171"/>
                        <channel id="47004" typeId="f1x45-47004"/>
                        <channel id="47005" typeId="f1x45-47005"/>
                        <channel id="47006" typeId="f1x45-47006"/>

diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f1x45-types.xml b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f1x45-types.xml
index bc07c2a0e85b353dee3ca3dc4f0484f2385ffc55..01c5905369c32189aed1c865717304b6cc79764c 100644 (file)
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f1x45-types.xml
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/OH-INF/thing/f1x45-types.xml
@@ -382,6 +382,13 @@
                <state pattern="%.1f °C" readOnly="true">
                </state>
        </channel-type>
+       <channel-type id="f1x45-40940" advanced="true">
+               <item-type>Number</item-type>
+               <label>Degree Minutes (32 Bit)</label>
+               <description>Degree minutes, 32bit value. Full resolution.</description>
+               <state min="-30000" max="30000" step="1" pattern="%.1f" readOnly="false">
+               </state>
+       </channel-type>
        <channel-type id="f1x45-43001" advanced="true">
                <item-type>Number</item-type>
                <label>Software Version</label>
@@ -3712,6 +3719,13 @@
                <state pattern="%d" readOnly="true">
                </state>
        </channel-type>
+       <channel-type id="f1x45-45171" advanced="true">
+               <item-type>Number</item-type>
+               <label>Alarm Reset</label>
+               <description>Reset alarm by setting value 1</description>
+               <state min="0" max="255" step="1" pattern="%d" readOnly="false">
+               </state>
+       </channel-type>
        <channel-type id="f1x45-47291" advanced="true">
                <item-type>Number</item-type>
                <label>Floor Drying Timer</label>