From 5949e425f09abcc8d2ea4ab300a79d1efdd01ecf Mon Sep 17 00:00:00 2001
From: Yogi4301 <49322659+Yogi4301@users.noreply.github.com>
Date: Wed, 10 Jun 2020 21:57:39 +0200
Subject: [PATCH 01/11] Update f1x45-channel-groups.xml
---
.../src/main/resources/ESH-INF/thing/f1x45-channel-groups.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-channel-groups.xml b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-channel-groups.xml
index 151e19ec0ab64..8d35c97e15fa7 100644
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-channel-groups.xml
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-channel-groups.xml
@@ -676,6 +676,9 @@
+
+
+
From 1155f6093d11d1736d5ea0e53a73dc7ab3aefda6 Mon Sep 17 00:00:00 2001
From: Yogi4301 <49322659+Yogi4301@users.noreply.github.com>
Date: Wed, 10 Jun 2020 22:05:11 +0200
Subject: [PATCH 02/11] Update f1x45-types.xml
---
.../resources/ESH-INF/thing/f1x45-types.xml | 32 +++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-types.xml b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-types.xml
index eb57299f17645..7ad7e7850aab2 100644
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-types.xml
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-types.xml
@@ -4854,6 +4854,38 @@
+
+ String
+
+ 0=inactive, 10=active
+
+
+
+
+
+
+
+
+ Number
+
+ Offset of the heat curve, Holiday
+
+
+
+
+ String
+
+ Hot water comfort mode Holiday, -1 = off, 0 = economy, 1 = normal, 2 = luxury
+
+
+
+
+
+
+
+
+
+
Number
From d1ff566b1ea9f732ca09df9782933c21a10060c8 Mon Sep 17 00:00:00 2001
From: Yogi4301 <49322659+Yogi4301@users.noreply.github.com>
Date: Wed, 10 Jun 2020 22:16:18 +0200
Subject: [PATCH 03/11] Update F1X45.java
---
.../openhab/binding/nibeheatpump/internal/models/F1X45.java | 3 +++
1 file changed, 3 insertions(+)
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 27149b207e871..856ea6a0b5970 100644
--- 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
@@ -695,6 +695,9 @@ public class F1X45 {
put(47540, new VariableInformation( 1, NibeDataType.S16, Type.SETTING , "Heat DM diff"));
put(47543, new VariableInformation( 1, NibeDataType.S16, Type.SETTING , "Cooling DM diff"));
put(47570, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Operational mode"));
+ put(48043, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Holiday - Activated"));
+ put(48046, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Heat Offset Holiday"));
+ put(48047, new VariableInformation( 1, NibeDataType.S8 , Type.SETTING , "Hot water mode Holiday"));
put(48053, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "FLM 2 speed 4"));
put(48054, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "FLM 2 speed 3"));
put(48055, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "FLM 2 speed 2"));
From fcfb0df55cdd1caeb314a570061988bede0fba52 Mon Sep 17 00:00:00 2001
From: Yogi4301 <49322659+Yogi4301@users.noreply.github.com>
Date: Wed, 10 Jun 2020 22:23:28 +0200
Subject: [PATCH 04/11] Update README.md
---
bundles/org.openhab.binding.nibeheatpump/README.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/bundles/org.openhab.binding.nibeheatpump/README.md b/bundles/org.openhab.binding.nibeheatpump/README.md
index adfd0e10665e5..c41af9bc7f53e 100644
--- a/bundles/org.openhab.binding.nibeheatpump/README.md
+++ b/bundles/org.openhab.binding.nibeheatpump/README.md
@@ -835,6 +835,9 @@ This binding currently supports following channels for F1x45 pump models:
| 47540 | Number | 10 | 2000 | Setting | Heat DM diff | |
| 47543 | Number | 10 | 150 | Setting | Cooling DM diff | |
| 47570 | String | 0 | 255 | Setting | Operational mode | 0=Auto, 1=Manual, 2=Add. heat only |
+| 48043 | String | 0 | 10 | Setting | Holiday - Activated | 0=inactive, 10=active |
+| 48046 | Number | -10 | 10 | Setting | Heat Offset Holiday | |
+| 48047 | String | -1 | 2 | Setting | Hot water mode Holiday | -1 = off, 0 = economy, 1 = normal, 2 = luxury |
| 48053 | Number | 0 | 100 | Setting | FLM 2 speed 4 | |
| 48054 | Number | 0 | 100 | Setting | FLM 2 speed 3 | |
| 48055 | Number | 0 | 100 | Setting | FLM 2 speed 2 | |
From 711d04c00bf3e6e1b3362fca767629a6e3f2dd50 Mon Sep 17 00:00:00 2001
From: Yogi4301 <49322659+Yogi4301@users.noreply.github.com>
Date: Thu, 11 Jun 2020 09:52:44 +0200
Subject: [PATCH 05/11] Update f1x45-channel-groups.xml
---
.../src/main/resources/ESH-INF/thing/f1x45-channel-groups.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-channel-groups.xml b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-channel-groups.xml
index 8d35c97e15fa7..1005e8376c4c9 100644
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-channel-groups.xml
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-channel-groups.xml
@@ -641,6 +641,10 @@
+
+
+
+
From 77e9ea85312b45479ccd047643a12b47c2b710ba Mon Sep 17 00:00:00 2001
From: Yogi4301 <49322659+Yogi4301@users.noreply.github.com>
Date: Thu, 11 Jun 2020 09:58:30 +0200
Subject: [PATCH 06/11] Update f1x45-types.xml
---
.../resources/ESH-INF/thing/f1x45-types.xml | 28 +++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-types.xml b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-types.xml
index 7ad7e7850aab2..50eb65f4e44fd 100644
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-types.xml
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-types.xml
@@ -4600,6 +4600,34 @@
Whether to allow cooling (only valid for operational mode Manual or Add. heat only)
+
+ Number
+
+ Start temperature for cooling
+
+
+
+
+ Number
+
+ Stop temperature for heating
+
+
+
+
+ Number
+
+ Stop temperature for additive
+
+
+
+
+ String
+
+ Filter time in hours
+
+
+
Number
From bd5279167fb908d58a52518485bd6df1dcdf0d4c Mon Sep 17 00:00:00 2001
From: Yogi4301 <49322659+Yogi4301@users.noreply.github.com>
Date: Thu, 11 Jun 2020 09:59:19 +0200
Subject: [PATCH 07/11] Update f1x45-channel-groups.xml
---
.../main/resources/ESH-INF/thing/f1x45-channel-groups.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-channel-groups.xml b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-channel-groups.xml
index 1005e8376c4c9..431c5bb2c46d3 100644
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-channel-groups.xml
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-channel-groups.xml
@@ -641,10 +641,10 @@
-
-
-
-
+
+
+
+
From 05222a7be54c5f3aeea55ff06d21f3027bd3504c Mon Sep 17 00:00:00 2001
From: Yogi4301 <49322659+Yogi4301@users.noreply.github.com>
Date: Thu, 11 Jun 2020 10:01:32 +0200
Subject: [PATCH 08/11] Update F1X45.java
---
.../openhab/binding/nibeheatpump/internal/models/F1X45.java | 4 ++++
1 file changed, 4 insertions(+)
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 856ea6a0b5970..20a0cd438df34 100644
--- 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
@@ -660,6 +660,10 @@ public class F1X45 {
put(47370, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Allow Additive Heating"));
put(47371, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Allow Heating"));
put(47372, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Allow Cooling"));
+ put(47374, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Start Temperature Cooling"));
+ put(47375, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Stop Temperature Heating"));
+ put(47376, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Stop Temperature Additive"));
+ put(47377, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Outdoor Filter Time"));
put(47378, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Max diff. comp."));
put(47379, new VariableInformation( 10, NibeDataType.S16, Type.SETTING , "Max diff. add."));
put(47380, new VariableInformation( 1, NibeDataType.U8 , Type.SETTING , "Low brine out autoreset"));
From 974eb9a45da87cf1f9807ad9b63e7c80e36ebf0e Mon Sep 17 00:00:00 2001
From: Yogi4301 <49322659+Yogi4301@users.noreply.github.com>
Date: Thu, 11 Jun 2020 10:04:18 +0200
Subject: [PATCH 09/11] Update README.md
---
bundles/org.openhab.binding.nibeheatpump/README.md | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/bundles/org.openhab.binding.nibeheatpump/README.md b/bundles/org.openhab.binding.nibeheatpump/README.md
index c41af9bc7f53e..aa829f10682c1 100644
--- a/bundles/org.openhab.binding.nibeheatpump/README.md
+++ b/bundles/org.openhab.binding.nibeheatpump/README.md
@@ -800,6 +800,10 @@ This binding currently supports following channels for F1x45 pump models:
| 47370 | Switch | 0 | 1 | Setting | Allow Additive Heating | |
| 47371 | Switch | 0 | 1 | Setting | Allow Heating | |
| 47372 | Switch | 0 | 1 | Setting | Allow Cooling | |
+| 47374 | Number | -200 | 400 | Setting | Start Temperature Cooling | |
+| 47375 | Number | -200 | 400 | Setting | Stop Temperature Heating | |
+| 47376 | Number | -250 | 400 | Setting | Stop Temperature Additive | |
+| 47377 | String | 0 | 48 | Setting | Outdoor Filter Time | |
| 47378 | Number | 10 | 250 | Setting | Max diff. comp. | |
| 47379 | Number | 10 | 240 | Setting | Max diff. add. | |
| 47380 | Switch | 0 | 1 | Setting | Low brine out autoreset | |
From d59a1b1e0981741ee3be7ef3f18fb082b960af60 Mon Sep 17 00:00:00 2001
From: Yogi4301 <49322659+Yogi4301@users.noreply.github.com>
Date: Thu, 11 Jun 2020 10:12:14 +0200
Subject: [PATCH 10/11] Update f1x45-types.xml
---
.../src/main/resources/ESH-INF/thing/f1x45-types.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-types.xml b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-types.xml
index 50eb65f4e44fd..0096a5ceb8834 100644
--- a/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-types.xml
+++ b/bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-types.xml
@@ -4622,7 +4622,7 @@
- String
+ Number
Filter time in hours
From eceded3af8071eff9f81110ddb4f2dcc441df74b Mon Sep 17 00:00:00 2001
From: Yogi4301 <49322659+Yogi4301@users.noreply.github.com>
Date: Thu, 11 Jun 2020 10:12:55 +0200
Subject: [PATCH 11/11] Update README.md
---
bundles/org.openhab.binding.nibeheatpump/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bundles/org.openhab.binding.nibeheatpump/README.md b/bundles/org.openhab.binding.nibeheatpump/README.md
index aa829f10682c1..2a3b1ee1231de 100644
--- a/bundles/org.openhab.binding.nibeheatpump/README.md
+++ b/bundles/org.openhab.binding.nibeheatpump/README.md
@@ -803,7 +803,7 @@ This binding currently supports following channels for F1x45 pump models:
| 47374 | Number | -200 | 400 | Setting | Start Temperature Cooling | |
| 47375 | Number | -200 | 400 | Setting | Stop Temperature Heating | |
| 47376 | Number | -250 | 400 | Setting | Stop Temperature Additive | |
-| 47377 | String | 0 | 48 | Setting | Outdoor Filter Time | |
+| 47377 | Number | 0 | 48 | Setting | Outdoor Filter Time | |
| 47378 | Number | 10 | 250 | Setting | Max diff. comp. | |
| 47379 | Number | 10 | 240 | Setting | Max diff. add. | |
| 47380 | Switch | 0 | 1 | Setting | Low brine out autoreset | |