Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nibeheatpump] Added further registers for model F1245 #7896

Merged
merged 14 commits into from
Jun 12, 2020
Merged

[nibeheatpump] Added further registers for model F1245 #7896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
36f92fc
Merge pull request #1 from openhab/2.5.x
Yogi4301 Jun 3, 2020
1963342
Merge pull request #2 from openhab/2.5.x
Yogi4301 Jun 5, 2020
1057155
Merge pull request #3 from openhab/2.5.x
Yogi4301 Jun 10, 2020
5949e42
Update f1x45-channel-groups.xml
Yogi4301 Jun 10, 2020
1155f60
Update f1x45-types.xml
Yogi4301 Jun 10, 2020
d1ff566
Update F1X45.java
Yogi4301 Jun 10, 2020
fcfb0df
Update README.md
Yogi4301 Jun 10, 2020
711d04c
Update f1x45-channel-groups.xml
Yogi4301 Jun 11, 2020
77e9ea8
Update f1x45-types.xml
Yogi4301 Jun 11, 2020
bd52791
Update f1x45-channel-groups.xml
Yogi4301 Jun 11, 2020
05222a7
Update F1X45.java
Yogi4301 Jun 11, 2020
974eb9a
Update README.md
Yogi4301 Jun 11, 2020
d59a1b1
Update f1x45-types.xml
Yogi4301 Jun 11, 2020
eceded3
Update README.md
Yogi4301 Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions bundles/org.openhab.binding.nibeheatpump/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 | 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 | |
Expand Down Expand Up @@ -835,6 +839,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 | |
Expand Down
7 changes: 7 additions & 0 deletions ...ng.nibeheatpump/src/main/java/org/openhab/binding/nibeheatpump/internal/models/F1X45.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down Expand Up @@ -695,6 +699,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"));
Expand Down
7 changes: 7 additions & 0 deletions ...rg.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-channel-groups.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,10 @@
<channel id="47370" typeId="f1x45-47370"/>
<channel id="47371" typeId="f1x45-47371"/>
<channel id="47372" typeId="f1x45-47372"/>
<channel id="47374" typeId="f1x45-47374"/>
<channel id="47375" typeId="f1x45-47375"/>
<channel id="47376" typeId="f1x45-47376"/>
<channel id="47377" typeId="f1x45-47377"/>
<channel id="47378" typeId="f1x45-47378"/>
<channel id="47379" typeId="f1x45-47379"/>
<channel id="47380" typeId="f1x45-47380"/>
Expand Down Expand Up @@ -676,6 +680,9 @@
<channel id="47540" typeId="f1x45-47540"/>
<channel id="47543" typeId="f1x45-47543"/>
<channel id="47570" typeId="f1x45-47570"/>
<channel id="48043" typeId="f1x45-48043"/>
<channel id="48046" typeId="f1x45-48046"/>
<channel id="48047" typeId="f1x45-48047"/>
<channel id="48053" typeId="f1x45-48053"/>
<channel id="48054" typeId="f1x45-48054"/>
<channel id="48055" typeId="f1x45-48055"/>
Expand Down
60 changes: 60 additions & 0 deletions bundles/org.openhab.binding.nibeheatpump/src/main/resources/ESH-INF/thing/f1x45-types.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4600,6 +4600,34 @@
<description>Whether to allow cooling (only valid for operational mode Manual or Add. heat only)</description>
<state readOnly="false"></state>
</channel-type>
<channel-type id="f1x45-47374" advanced="true">
<item-type>Number</item-type>
<label>Start Temperature Cooling</label>
<description>Start temperature for cooling</description>
<state min="-200" max="400" step="1" pattern="%.1f °C" readOnly="false">
</state>
</channel-type>
<channel-type id="f1x45-47375" advanced="true">
<item-type>Number</item-type>
<label>Stop Temperature Heating</label>
<description>Stop temperature for heating</description>
<state min="-200" max="400" step="1" pattern="%.1f °C" readOnly="false">
</state>
</channel-type>
<channel-type id="f1x45-47376" advanced="true">
<item-type>Number</item-type>
<label>Stop Temperature Additive</label>
<description>Stop temperature for additive</description>
<state min="-250" max="400" step="1" pattern="%.1f °C" readOnly="false">
</state>
</channel-type>
<channel-type id="f1x45-47377" advanced="true">
<item-type>Number</item-type>
<label>Outdoor Filter Time</label>
<description>Filter time in hours</description>
<state min="0" max="48" step="1" pattern="%d h" readOnly="false">
</state>
</channel-type>
<channel-type id="f1x45-47378" advanced="true">
<item-type>Number</item-type>
<label>Max Diff. Comp.</label>
Expand Down Expand Up @@ -4854,6 +4882,38 @@
</options>
</state>
</channel-type>
<channel-type id="f1x45-48043" advanced="true">
<item-type>String</item-type>
<label>Holiday - Activated</label>
<description>0=inactive, 10=active</description>
<state min="0" max="10" step="1" pattern="%d" readOnly="false">
<options>
<option value="0">inactive</option>
<option value="10">active</option>
</options>
</state>
</channel-type>
<channel-type id="f1x45-48046" advanced="true">
<item-type>Number</item-type>
<label>Heat Offset Holiday</label>
<description>Offset of the heat curve, Holiday</description>
<state min="-10" max="10" step="1" pattern="%d" readOnly="false">
</state>
</channel-type>
<channel-type id="f1x45-48047" advanced="true">
<item-type>String</item-type>
<label>Hot water mode Holiday</label>
<description>Hot water comfort mode Holiday, -1 = off, 0 = economy, 1 = normal, 2 = luxury
</description>
<state min="-1" max="2" step="1" pattern="%d" readOnly="false">
<options>
<option value="-1">off</option>
<option value="0">economy</option>
<option value="1">normal</option>
<option value="2">luxury</option>
</options>
</state>
</channel-type>
<channel-type id="f1x45-48053" advanced="true">
<item-type>Number</item-type>
<label>FLM 2 Speed 4</label>
Expand Down