Fix Merge Conflict

OpenZWave · Dec 22, 2015 · a3470da · a3470da
2 parents 38ddc44 + 975e8f4
commit a3470da
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -242,6 +242,7 @@ Version 1.3
  - Add additional codes for Fibaro FGRM222 Roller Shutter from proohu01 (Justin)
  - Add ZME_064381 IP44 Plug-in Switch config from Geoff Coupe (Justin)
  - Pull Request #712 - New Manager::GetValueListValues function to get the indexes of a List  from out4b (Justin)
+ - Pull Request #710 - Added config files for Eurotronic Comet thermostatic radiator valve (Justin)
 
 Version 1.2 
  - Released on 15/10/14

diff --git a/config/eurotronic/eur_cometz.xml b/config/eurotronic/eur_cometz.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Product xmlns='http://code.google.com/p/open-zwave/'>
+
+        <CommandClass id="64" >
+                <Instance index="1" />
+                <Value type="list" genre="user" instance="1" index="0" label="Mode" min="0" max="11" value="0" size="1">
+                        <Item label="Off" value="0" />
+                        <Item label="Heat" value="1" />
+                        <Item label="Heat Econ" value="11" />
+                </Value>
+                <SupportedModes>
+                        <Mode index="0" label="Off" />
+                        <Mode index="1" label="Heat" />
+                        <Mode index="11" label="Heat Econ" />
+                </SupportedModes>
+        </CommandClass>
+        <CommandClass id="67" base="0">
+                <Instance index="1" />
+                <Value type="decimal" genre="user" instance="1" index="1" label="Comfort setpoint" units="C" value="0"/>
+                <Value type="decimal" genre="user" instance="1" index="11" label="Energy saving setpoint" units="C" value="0"/>
+        </CommandClass>
+</Product>
diff --git a/config/manufacturer_specific.xml b/config/manufacturer_specific.xml
@@ -220,6 +220,7 @@
 	</Manufacturer>
 	<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"/>
 	</Manufacturer>
 	<Manufacturer id="0128" name="Eneco">
 		<Product type="0000" id="0000" name="ED2.0 Meter Adapter"/>

diff --git a/distfiles.mk b/distfiles.mk
@@ -64,6 +64,7 @@ DISTFILES =	.gitignore \
 	config/duwi/ZWES1000.xml \
 	config/duwi/ZWESJ300.xml \
 	config/enerwave/zwn-sc7.xml \
+	config/eurotronic/eur_cometz.xml \
 	config/eurotronic/eur_stellaz.xml \
 	config/everspring/ad146.xml \
 	config/everspring/ad147.xml \