File 1387.patch of Package openzwave
From 7b8e72515f944a7b6a9171b6ca1d810d0b9f1f7b Mon Sep 17 00:00:00 2001
From: Tobias <tobias@codeatelier.com>
Date: Fri, 15 Sep 2017 10:12:22 +0200
Subject: [PATCH 1/8] Add support for EUROtronic Spirit Z-wave Plus Thermostat
---
config/eurotronic/eur_spiritz.xml | 83 +++++++++++++++++++++++++++++++++++++++
config/manufacturer_specific.xml | 1 +
2 files changed, 84 insertions(+)
create mode 100644 config/eurotronic/eur_spiritz.xml
diff --git a/config/eurotronic/eur_spiritz.xml b/config/eurotronic/eur_spiritz.xml
new file mode 100644
index 000000000..ea038f1af
--- /dev/null
+++ b/config/eurotronic/eur_spiritz.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product xmlns='http://code.google.com/p/open-zwave/'>
+ <CommandClass id="67" base="0" typeInterpretation="A" />
+ <CommandClass id="64" >
+ <Instance index="1" />
+ <Value type="list" genre="user" instance="1" index="0" label="Mode">
+ <Item label="Off" value="0" />
+ <Item label="Heat" value="1" />
+ <Item label="Heat Econ" value="11" />
+ <Item label="Full Power" value="15" />
+ <Item label="Manufacturer Specific" value="31" />
+ </Value>
+ <SupportedModes>
+ <Mode index="0" label="Off" />
+ <Mode index="1" label="Heat" />
+ <Mode index="11" label="Heat Econ" />
+ <Mode index="15" label="Full Power" />
+ <Mode index="31" label="Manufacturer Specific" />
+ </SupportedModes>
+ </CommandClass>
+
+ <CommandClass id="112">
+ <Value type="byte" genre="config" instance="1" index="1" label="Invert LCD" min="0" max="1" units="" value="0">
+ <Help>
+ 0x00 LCD normal
+ 0x01 LCD inverted / upside down
+ Default: 0x00
+ </Help>
+ </Value>
+ <Value type="byte" genre="config" instance="1" index="2" label="LCD Timeout" min="0" max="30" units="" value="0">
+ <Help>
+ 0x00 No Timeout, LCD always on
+ 0x05-0x1E Timeout after 5 - 30s
+ default: 0x00
+ </Help>
+ </Value>
+ <Value type="byte" genre="config" instance="1" index="3" label="Backlight" min="0" max="1" units="" value="1">
+ <Help>
+ 0x00 No Backlight
+ 0x01 Backlight active
+ default: 0x01
+ </Help>
+ </Value>
+ <Value type="byte" genre="config" instance="1" index="4" label="Battery Status" min="0" max="1" units="" value="1">
+ <Help>
+ 0x00 Only send battery status as notification
+ 0x01 send battery status 1x daily
+ default: 0x01
+ </Help>
+ </Value>
+ <Value type="byte" genre="config" instance="1" index="5" label="Temperature Report Threshold" min="0" max="50" units="°C" value="5">
+ <Help>
+ 0x00 Don't send temperature automatically
+ 0x01 – 0x32 Report temperature at 0,1 - 5.0°C temperature difference
+ default 0x05 (Delta = 0,5°C )
+ </Help>
+ </Value>
+ <Value type="byte" genre="config" instance="1" index="6" label="Valve Opening Degree" min="0" max="100" units="" value="0">
+ <Help>
+ 0x00 Don't send Valve opening degree automatically
+ 0x01-0x64 report valve opening degree at a delta of 1 - 100%.
+ default 0x00
+ </Help>
+ </Value>
+ <Value type="byte" genre="config" instance="1" index="7" label="Open Window Detection" min="0" max="3" units="" value="2">
+ <Help>
+ 0x00 Disabled
+ 0x01 low sensibility
+ 0x02 medium sensibility
+ 0x03 high sensibility
+ default: 0x02
+ </Help>
+ </Value>
+ <Value type="byte" genre="config" instance="1" index="8" label="Temperature Offset" min="-50" max="128" units="" value="0">
+ <Help>
+ 0xCE-0x32 -5,0°C – (+)5,0°C
+ 0x80 External Temperature Sensor
+ default: 0x00 0,0°C Offset
+ </Help>
+ </Value>
+ </CommandClass>
+</Product>
+
diff --git a/config/manufacturer_specific.xml b/config/manufacturer_specific.xml
index 16769e9ff..30fcea76c 100644
--- a/config/manufacturer_specific.xml
+++ b/config/manufacturer_specific.xml
@@ -281,6 +281,7 @@
<Manufacturer id="0148" name="EUROtronic">
<Product type="0001" id="0001" name="EUR_STELLAZ Wall Radiator Thermostat Valve Control" config="eurotronic/eur_stellaz.xml"/>
<Product type="0002" id="0001" name="EUR_COMETZ Wall Radiator Thermostat Valve Control" config="eurotronic/eur_cometz.xml"/>
+ <Product type="0003" id="0001" name="EUR_SPIRITZ Wall Radiator Thermostat" config="eurotronic/eur_spiritz.xml"/>
</Manufacturer>
<Manufacturer id="0128" name="Eneco">
<Product type="0000" id="0000" name="ED2.0 Meter Adapter"/>
From 366aaf75cd82cb8f7fb9d45d08a1595d5aefbffe Mon Sep 17 00:00:00 2001
From: Kame <tobiasgraf@users.noreply.github.com>
Date: Mon, 13 Nov 2017 10:29:06 +0100
Subject: [PATCH 2/8] Update eur_spiritz.xml
Correct min. max for Temperature Offset
---
config/eurotronic/eur_spiritz.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/eurotronic/eur_spiritz.xml b/config/eurotronic/eur_spiritz.xml
index ea038f1af..2e4464666 100644
--- a/config/eurotronic/eur_spiritz.xml
+++ b/config/eurotronic/eur_spiritz.xml
@@ -71,7 +71,7 @@
default: 0x02
</Help>
</Value>
- <Value type="byte" genre="config" instance="1" index="8" label="Temperature Offset" min="-50" max="128" units="" value="0">
+ <Value type="byte" genre="config" instance="1" index="8" label="Temperature Offset" min="-128" max="50" units="" value="0">
<Help>
0xCE-0x32 -5,0°C – (+)5,0°C
0x80 External Temperature Sensor
From 6bbc24631bedc704bb7649972d7eedecc4e75c1c Mon Sep 17 00:00:00 2001
From: Kame <tobiasgraf@users.noreply.github.com>
Date: Thu, 16 Nov 2017 16:08:07 +0100
Subject: [PATCH 3/8] Add new product type ids for Eurotronic Spirit Z
new Product Type ID for Eurotronic Spirit Z Radiator thermostat
---
config/manufacturer_specific.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/config/manufacturer_specific.xml b/config/manufacturer_specific.xml
index 30fcea76c..9c9eba8b4 100644
--- a/config/manufacturer_specific.xml
+++ b/config/manufacturer_specific.xml
@@ -282,6 +282,9 @@
<Product type="0001" id="0001" name="EUR_STELLAZ Wall Radiator Thermostat Valve Control" config="eurotronic/eur_stellaz.xml"/>
<Product type="0002" id="0001" name="EUR_COMETZ Wall Radiator Thermostat Valve Control" config="eurotronic/eur_cometz.xml"/>
<Product type="0003" id="0001" name="EUR_SPIRITZ Wall Radiator Thermostat" config="eurotronic/eur_spiritz.xml"/>
+ <Product type="0003" id="0002" name="EUR_SPIRITZ Wall Radiator Thermostat" config="eurotronic/eur_spiritz.xml"/>
+ <Product type="0003" id="0003" name="EUR_SPIRITZ Wall Radiator Thermostat" config="eurotronic/eur_spiritz.xml"/>
+ </Manufacturer>
</Manufacturer>
<Manufacturer id="0128" name="Eneco">
<Product type="0000" id="0000" name="ED2.0 Meter Adapter"/>
From 4e404ab84a4849dda705e9d11575a6e7608e561e Mon Sep 17 00:00:00 2001
From: Kame <tobiasgraf@users.noreply.github.com>
Date: Mon, 20 Nov 2017 07:20:28 +0100
Subject: [PATCH 4/8] remove duplicate closing tag.
---
config/manufacturer_specific.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/config/manufacturer_specific.xml b/config/manufacturer_specific.xml
index 9c9eba8b4..f9331f9af 100644
--- a/config/manufacturer_specific.xml
+++ b/config/manufacturer_specific.xml
@@ -285,7 +285,6 @@
<Product type="0003" id="0002" name="EUR_SPIRITZ Wall Radiator Thermostat" config="eurotronic/eur_spiritz.xml"/>
<Product type="0003" id="0003" name="EUR_SPIRITZ Wall Radiator Thermostat" config="eurotronic/eur_spiritz.xml"/>
</Manufacturer>
- </Manufacturer>
<Manufacturer id="0128" name="Eneco">
<Product type="0000" id="0000" name="ED2.0 Meter Adapter"/>
<Product type="0128" id="0000" name="ED2.0 Display"/>
From 01fb73505e756967ef4bd662247463988eecfa12 Mon Sep 17 00:00:00 2001
From: Daniel <epegzz@gmail.com>
Date: Sat, 25 Nov 2017 05:04:50 +0100
Subject: [PATCH 5/8] Improve SpiritZ config
---
config/eurotronic/eur_spiritz.xml | 123 +++++++++++++++++++++++---------------
distfiles.mk | 1 +
2 files changed, 76 insertions(+), 48 deletions(-)
diff --git a/config/eurotronic/eur_spiritz.xml b/config/eurotronic/eur_spiritz.xml
index 2e4464666..7d527fbc0 100644
--- a/config/eurotronic/eur_spiritz.xml
+++ b/config/eurotronic/eur_spiritz.xml
@@ -1,83 +1,110 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+Eurotronic Spirit Z-Wave Plus Thermostat
+Product website: https://www.eurotronic.org/produkte/spirit-z-wave-plus.html
+Tech manual: https://www.eurotronic.org/fileadmin/user_upload/eurotronic.org/Produktbilder/spirit_z_wave_plus/Spirit_Z-Wave_BAL_web_EN_view_04.pdf
+-->
<Product xmlns='http://code.google.com/p/open-zwave/'>
- <CommandClass id="67" base="0" typeInterpretation="A" />
- <CommandClass id="64" >
+ <!-- Multilevel switch for setting valve opening -->
+ <CommandClass id="38">
+ <Value type="byte" genre="user" index="0" label="Valve Opening" units="%" min="0" max="100" value="0" />
+ </CommandClass>
+
+ <!-- Thermostat mode -->
+ <CommandClass id="64">
<Instance index="1" />
<Value type="list" genre="user" instance="1" index="0" label="Mode">
- <Item label="Off" value="0" />
- <Item label="Heat" value="1" />
- <Item label="Heat Econ" value="11" />
- <Item label="Full Power" value="15" />
- <Item label="Manufacturer Specific" value="31" />
+ <Help>
+ Off: No heating, only frost protection.
+ Auto: Room temperature will be kept at the configured setpoint.
+ Eco: Energy save heating mode. Room temperature will be lowered to the configured eco setpoint in order to save energy.
+ Full Power: Full power heating. This mode is left automatically after 5 minutes.
+ Manufacturer Specific: Direct valve control mode. The valve opening percentage can be controlled using the switch multilevel command class.
+ </Help>
+ <Item label="Off" value="0" />
+ <Item label="Auto" value="1" />
+ <Item label="Eco" value="11" />
+ <Item label="Full Power" value="15" />
+ <Item label="Manufacturer Specific" value="31" />
</Value>
<SupportedModes>
- <Mode index="0" label="Off" />
- <Mode index="1" label="Heat" />
- <Mode index="11" label="Heat Econ" />
- <Mode index="15" label="Full Power" />
- <Mode index="31" label="Manufacturer Specific" />
+ <Mode index="0" label="Off" />
+ <Mode index="1" label="Auto" />
+ <Mode index="11" label="Eco" />
+ <Mode index="15" label="Full Power" />
+ <Mode index="31" label="Manufacturer Specific" />
</SupportedModes>
</CommandClass>
+ <!-- Setpoints -->
+ <CommandClass id="67" base="0" typeInterpretation="A">
+ <Instance index="1"/>
+ <Value type="decimal" genre="user" instance="1" index="1" label="Target Temperature" units="°C" read_only="false" write_only="false" min="8" max="28" value="20"/>
+ <Value type="decimal" genre="user" instance="1" index="11" label="Target Temperature Eco" units="°C" read_only="false" write_only="false" min="8" max="28" value="16"/>
+ </CommandClass>
+
+ <!-- Configuration Parameters -->
<CommandClass id="112">
- <Value type="byte" genre="config" instance="1" index="1" label="Invert LCD" min="0" max="1" units="" value="0">
+ <Instance index="1"/>
+ <Value type="list" genre="config" instance="1" index="1" label="LCD Invert" min="0" max="1" value="0" size="1">
<Help>
- 0x00 LCD normal
- 0x01 LCD inverted / upside down
- Default: 0x00
+ Allows rotating the LCD contents by 180 degrees.
+ Default: Normal
</Help>
+ <Item label="Normal" value="0" />
+ <Item label="Upside Down" value="1" />
</Value>
- <Value type="byte" genre="config" instance="1" index="2" label="LCD Timeout" min="0" max="30" units="" value="0">
+ <Value type="byte" genre="config" instance="1" index="2" label="LCD Timeout" min="0" max="30" units="sec" value="0">
<Help>
- 0x00 No Timeout, LCD always on
- 0x05-0x1E Timeout after 5 - 30s
- default: 0x00
+ 0: No Timeout, LCD always on.
+ 5-30: Timeout after 5-30s.
+ Default: 0 (LCD always on)
</Help>
</Value>
- <Value type="byte" genre="config" instance="1" index="3" label="Backlight" min="0" max="1" units="" value="1">
+ <Value type="list" genre="config" instance="1" index="3" label="Backlight" min="0" max="1" units="" value="1" size="1">
<Help>
- 0x00 No Backlight
- 0x01 Backlight active
- default: 0x01
+ Default: Backlight enabled
</Help>
+ <Item label="Backlight disabled" value="0" />
+ <Item label="Backlight enabled" value="1" />
</Value>
- <Value type="byte" genre="config" instance="1" index="4" label="Battery Status" min="0" max="1" units="" value="1">
+ <Value type="list" genre="config" instance="1" index="4" label="Battery Report" min="0" max="1" units="" value="1" size="1">
<Help>
- 0x00 Only send battery status as notification
- 0x01 send battery status 1x daily
- default: 0x01
+ Default: Send once a day
</Help>
+ <Item label="Only send battery status as notification" value="0" />
+ <Item label="Send once a day" value="1" />
</Value>
- <Value type="byte" genre="config" instance="1" index="5" label="Temperature Report Threshold" min="0" max="50" units="°C" value="5">
+ <Value type="byte" genre="config" instance="1" index="5" label="Temperature Report Threshold" min="0" max="50" units="0.1°C" value="5">
<Help>
- 0x00 Don't send temperature automatically
- 0x01 – 0x32 Report temperature at 0,1 - 5.0°C temperature difference
- default 0x05 (Delta = 0,5°C )
+ 0: Don't send temperature automatically.
+ 1-50: Report temperature at 0.1-5.0°C temperature difference.
+ Default: 5 (Delta = 0.5°C)
</Help>
</Value>
- <Value type="byte" genre="config" instance="1" index="6" label="Valve Opening Degree" min="0" max="100" units="" value="0">
+ <Value type="byte" genre="config" instance="1" index="6" label="Valve Opening Percentage Report" min="0" max="100" units="" value="0">
<Help>
- 0x00 Don't send Valve opening degree automatically
- 0x01-0x64 report valve opening degree at a delta of 1 - 100%.
- default 0x00
+ 0: Don't send Valve opening percentage automatically.
+ 1-100: Report valve opening percentage at a delta of 1-100%.
+ Default: 0
</Help>
- </Value>
- <Value type="byte" genre="config" instance="1" index="7" label="Open Window Detection" min="0" max="3" units="" value="2">
+ </Value>
+ <Value type="list" genre="config" instance="1" index="7" label="Open Window Detection" min="0" max="3" units="" value="2" size="1">
<Help>
- 0x00 Disabled
- 0x01 low sensibility
- 0x02 medium sensibility
- 0x03 high sensibility
- default: 0x02
+ Default: Medium sensibility
</Help>
+ <Item label="Disabled" value="0" />
+ <Item label="Low sensibility" value="1" />
+ <Item label="Medium sensibility" value="2" />
+ <Item label="High sensibility" value="3" />
</Value>
- <Value type="byte" genre="config" instance="1" index="8" label="Temperature Offset" min="-128" max="50" units="" value="0">
+ <Value type="byte" genre="config" instance="1" index="8" label="Measured Temperature Offset" min="0" max="255" units="" value="0">
<Help>
- 0xCE-0x32 -5,0°C – (+)5,0°C
- 0x80 External Temperature Sensor
- default: 0x00 0,0°C Offset
+ 206-255: -5.0 to -0.1°C.
+ 0-50: 0°C-5°C.
+ 128: External Temperature Sensor.
+ Default: 0 (0.0°C Offset)
</Help>
</Value>
</CommandClass>
</Product>
-
diff --git a/distfiles.mk b/distfiles.mk
index 96f1a7552..7b2eb162c 100644
--- a/distfiles.mk
+++ b/distfiles.mk
@@ -102,6 +102,7 @@ DISTFILES = .gitignore \
config/enerwave/zwn-bpc.xml \
config/enerwave/zwn-sc7.xml \
config/eurotronic/eur_cometz.xml \
+ config/eurotronic/eur_spiritz.xml \
config/eurotronic/eur_stellaz.xml \
config/everspring/ad146.xml \
config/everspring/ad147.xml \
From f2edddac68411045ed820fcf2c3bb1547b5dd7e4 Mon Sep 17 00:00:00 2001
From: Daniel <epegzz@gmail.com>
Date: Mon, 27 Nov 2017 19:38:29 +0100
Subject: [PATCH 6/8] Don't update disfiles.mk
---
distfiles.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/distfiles.mk b/distfiles.mk
index 7b2eb162c..96f1a7552 100644
--- a/distfiles.mk
+++ b/distfiles.mk
@@ -102,7 +102,6 @@ DISTFILES = .gitignore \
config/enerwave/zwn-bpc.xml \
config/enerwave/zwn-sc7.xml \
config/eurotronic/eur_cometz.xml \
- config/eurotronic/eur_spiritz.xml \
config/eurotronic/eur_stellaz.xml \
config/everspring/ad146.xml \
config/everspring/ad147.xml \
From f91ae0affe02a9e1b1822a6c9964cd4b48cd2a6d Mon Sep 17 00:00:00 2001
From: Daniel <epegzz@gmail.com>
Date: Mon, 27 Nov 2017 19:40:42 +0100
Subject: [PATCH 7/8] Use mode/setpoint naming according to specs
---
config/eurotronic/eur_spiritz.xml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/config/eurotronic/eur_spiritz.xml b/config/eurotronic/eur_spiritz.xml
index 7d527fbc0..3500ac5ca 100644
--- a/config/eurotronic/eur_spiritz.xml
+++ b/config/eurotronic/eur_spiritz.xml
@@ -16,21 +16,21 @@ Tech manual: https://www.eurotronic.org/fileadmin/user_upload/eurotronic.org/Pro
<Value type="list" genre="user" instance="1" index="0" label="Mode">
<Help>
Off: No heating, only frost protection.
- Auto: Room temperature will be kept at the configured setpoint.
- Eco: Energy save heating mode. Room temperature will be lowered to the configured eco setpoint in order to save energy.
+ Heat: Room temperature will be kept at the configured setpoint.
+ Heat Eco: Energy save heating mode. Room temperature will be lowered to the configured eco setpoint in order to save energy.
Full Power: Full power heating. This mode is left automatically after 5 minutes.
Manufacturer Specific: Direct valve control mode. The valve opening percentage can be controlled using the switch multilevel command class.
</Help>
<Item label="Off" value="0" />
- <Item label="Auto" value="1" />
- <Item label="Eco" value="11" />
+ <Item label="Heat" value="1" />
+ <Item label="Heat Eco" value="11" />
<Item label="Full Power" value="15" />
<Item label="Manufacturer Specific" value="31" />
</Value>
<SupportedModes>
<Mode index="0" label="Off" />
- <Mode index="1" label="Auto" />
- <Mode index="11" label="Eco" />
+ <Mode index="1" label="Heat" />
+ <Mode index="11" label="Heat Eco" />
<Mode index="15" label="Full Power" />
<Mode index="31" label="Manufacturer Specific" />
</SupportedModes>
@@ -39,8 +39,8 @@ Tech manual: https://www.eurotronic.org/fileadmin/user_upload/eurotronic.org/Pro
<!-- Setpoints -->
<CommandClass id="67" base="0" typeInterpretation="A">
<Instance index="1"/>
- <Value type="decimal" genre="user" instance="1" index="1" label="Target Temperature" units="°C" read_only="false" write_only="false" min="8" max="28" value="20"/>
- <Value type="decimal" genre="user" instance="1" index="11" label="Target Temperature Eco" units="°C" read_only="false" write_only="false" min="8" max="28" value="16"/>
+ <Value type="decimal" genre="user" instance="1" index="1" label="Heat" units="°C" read_only="false" write_only="false" min="8" max="28" value="20"/>
+ <Value type="decimal" genre="user" instance="1" index="11" label="Heat Eco" units="°C" read_only="false" write_only="false" min="8" max="28" value="16"/>
</CommandClass>
<!-- Configuration Parameters -->
From 6d9d94640bf200e613378db8ff4d6f220e9b6da0 Mon Sep 17 00:00:00 2001
From: diman1234 <diman1234@git.git>
Date: Fri, 29 Dec 2017 23:13:37 +0100
Subject: [PATCH 8/8] Updated the config file to new dev branch format.
---
config/device_configuration.xsd | 1 +
config/eurotronic/eur_spiritz.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/config/device_configuration.xsd b/config/device_configuration.xsd
index e4621ac49..6290926fa 100644
--- a/config/device_configuration.xsd
+++ b/config/device_configuration.xsd
@@ -69,6 +69,7 @@
<xs:attribute name='base' type='xs:string' use='optional'/>
<xs:attribute name='override_precision' type='xs:string' use='optional'/>
<xs:attribute name='scenecount' type='xs:string' use='optional'/>
+ <xs:attribute name='typeInterpretation' type='xs:string' use='optional'/>
<xs:attribute name='create_vars' use='optional'>
<xs:simpleType>
<xs:restriction base='xs:string'>
diff --git a/config/eurotronic/eur_spiritz.xml b/config/eurotronic/eur_spiritz.xml
index 3500ac5ca..abe45c189 100644
--- a/config/eurotronic/eur_spiritz.xml
+++ b/config/eurotronic/eur_spiritz.xml
@@ -4,7 +4,7 @@ Eurotronic Spirit Z-Wave Plus Thermostat
Product website: https://www.eurotronic.org/produkte/spirit-z-wave-plus.html
Tech manual: https://www.eurotronic.org/fileadmin/user_upload/eurotronic.org/Produktbilder/spirit_z_wave_plus/Spirit_Z-Wave_BAL_web_EN_view_04.pdf
-->
-<Product xmlns='http://code.google.com/p/open-zwave/'>
+<Product xmlns='https://github.com/OpenZWave/open-zwave' Revision="1">
<!-- Multilevel switch for setting valve opening -->
<CommandClass id="38">
<Value type="byte" genre="user" index="0" label="Valve Opening" units="%" min="0" max="100" value="0" />
