Skip to content

Commit 3c602e9

Browse files
rkluwenrkluwen
committed
Merge branch 'MyDomoticz' of /home/domoshare into MyDomoticz
2 parents ae20f2b + e14e091 commit 3c602e9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1660
-1153
lines changed

‎Config/aeotec/sd6.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@
160160
</Help>
161161
</Value>
162162
</CommandClass>
163+
<CommandClass id="96" mapping="endpoints" forceUniqueEndpoints="true" />
163164

164165
<!-- Association Groups -->
165166
<CommandClass id="133">

‎Config/device_configuration.xsd

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,14 @@
116116
</xs:restriction>
117117
</xs:simpleType>
118118
</xs:attribute>
119+
<xs:attribute name='forceUniqueEndpoints' use='optional'>
120+
<xs:simpleType>
121+
<xs:restriction base='xs:string'>
122+
<xs:enumeration value='true'/>
123+
<xs:enumeration value='false'/>
124+
</xs:restriction>
125+
</xs:simpleType>
126+
</xs:attribute>
119127
<xs:attribute name='version' type='xs:string' use='optional'/>
120128
<xs:attribute name='request_flags' type='xs:string' use='optional'/>
121129
<xs:attribute name='endpoints' type='xs:string' use='optional'/>

‎Config/enerwave/zwn-sc7.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Enerwave ZWN-SC7 -->
3+
<Product xmlns='http://code.google.com/p/open-zwave/'>
4+
<!-- COMMAND_CLASS_BASIC does not respond to requests -->
5+
<CommandClass id="32" action="remove" />
6+
</Product>

‎Config/homeseer/hsm200.xml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Product xmlns='http://code.google.com/p/open-zwave/'>
3+
<!-- Configuration Parameters -->
4+
<CommandClass id="112">
5+
<Value type="byte" index="0" genre="config" label="Unidentified Parameter" units="" min="0" max="255" value="5">
6+
<Help>
7+
Parameter #0 is undocumented: let us know if you know what it does!
8+
Attributes (type, units, min and max) are wild guesses, except default value.
9+
</Help>
10+
</Value>
11+
<Value type="byte" index="1" genre="config" label="On Time" units="minutes" min="0" max="255" value="20">
12+
<Help>
13+
On Time sets the number of minutes that the lights stay on when
14+
motion has not been detected.
15+
A value of 0 On Time is a special mode where the lights are
16+
constantly sent a command to turn them on whenever motion is
17+
detected. The device will NOT turn the lights off in this mode.
18+
Note that this mode will significantly shorten battery life.
19+
Recommended values:
20+
5 min for hallways.
21+
20 min for an office environment.
22+
60 min for a library or other room where someone may be sitting
23+
still for a long time.
24+
This may be inaccurate, but default for Homeseer HSM100 may actually be 3 minutes, instead of 20?
25+
</Help>
26+
</Value>
27+
<Value type="byte" index="2" genre="config" label="On Level" min="-1" max="99" value="99">
28+
<Help>
29+
OnLevel is the value sent by the Z-Wave BASIC_SET command to all Association Group 2 nodes when motion is detected.
30+
A value of 0 will turn the lights off (not recommended).
31+
A value between 1 and 99 will set the dim level to between 1% and 99% (99% is full on).
32+
A value of -1 will turn the light “on” which depends on the device but most will set the dim level to the last dim setting.
33+
</Help>
34+
</Value>
35+
<Value type="byte" index="3" genre="config" label="Lite Minutes" min="0" max="255" value="5">
36+
<Help>
37+
LiteMinutes. A Luminance report is sent to the system controller every LiteMin minutes.
38+
A value of zero turns this mode off. Luminance values can still be obtained at any time by the home control application in this mode.
39+
</Help>
40+
</Value>
41+
<Value type="byte" index="4" genre="config" label="Temp Minutes" min="0" max="255" value="5">
42+
<Help>
43+
TempMinutes. A Temperature report is sent to the controller every TempMin minutes.
44+
A value of zero turns this mode off. Temperature values can still be obtained at any time by polling the status of the temperature sensor.
45+
</Help>
46+
</Value>
47+
<Value type="byte" index="5" genre="config" label="Temp Adj" min="-128" max="127" value="0">
48+
<Help>
49+
TempAdj. TempAdj is a twos-complement number that is used to adjust the temperature reading to make it more accurate. The value is in tenths of degree Fahrenheit. The temperature reading can be adjusted by +12.7F to -12.8F. A value of 1 will adjust the temperature reading by +0.1F. A value of -1 will adjust the temperature by -0.1F. A value of 123 will adjust the temperature by +12.3F.
50+
</Help>
51+
</Value>
52+
</CommandClass>
53+
<!-- Association Groups -->
54+
<CommandClass id="133">
55+
<Associations num_groups="2">
56+
<Group index="1" max_associations="1" label="Motion Notification" auto="true"/>
57+
<Group index="2" max_associations="4" label="Motion Control" auto="true"/>
58+
</Associations>
59+
</CommandClass>
60+
</Product>

‎Config/linear/PD300Z-2.xml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,11 @@
22
<Product xmlns='http://code.google.com/p/open-zwave/'>
33
<!-- Configuration Parameters -->
44
<CommandClass id="112">
5-
<Value type="list" index="29" genre="config" label="Load Sensing" size="1" value="0">
6-
<Help>Turn on the module when the attached load is connected</Help>
7-
<Item label="No" value="0" />
8-
<Item label="Yes" value="1" />
5+
<Value type="bool" index="29" genre="config" label="Load Sensing" size="1" value="False">
6+
<Help>Turn on the module when the attached load is connected.</Help>
97
</Value>
10-
<Value type="list" index="5" genre="config" label="Ignore Start-Level (Receiving)" size="1" value="1">
11-
<Help>This dimmer will start dimming from its current level.</Help>
12-
<Item label="No" value="0" />
13-
<Item label="Yes" value="1" />
8+
<Value type="bool" index="5" genre="config" label="Ignore Start-Level (Receiving)" size="1" value="True">
9+
<Help>This dimmer will always start dimming from its current level, ignoring any commanded start level.</Help>
1410
</Value>
1511
</CommandClass>
1612
<!-- Set correct max level for COMMAND_CLASS_SWITCH_MULTILEVEL, the dimmer will ignore any commands to set value >99 -->

‎Config/linear/WD500Z-1.xml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,16 @@
22
<Product xmlns='http://code.google.com/p/open-zwave/'>
33
<!-- Configuration Parameters -->
44
<CommandClass id="112">
5-
<Value type="list" index="3" genre="config" label="Night Light" size="1" value="0">
6-
<Help>In night-light mode the LED on the switch will turn ON when the switch is turned OFF.</Help>
7-
<Item label="No" value="0" />
8-
<Item label="Yes" value="1" />
5+
<Value type="list" index="3" genre="config" label="LED Mode" size="1" value="0">
6+
<Help>In night-light mode the LED on the switch will turn ON when the switch is turned OFF, instead of folliwng the state of the load.</Help>
7+
<Item label="Normal" value="0" />
8+
<Item label="Night-light" value="1" />
99
</Value>
10-
<Value type="list" index="4" genre="config" label="Invert Switch" size="1" value="0">
11-
<Help>Change the top of the switch to OFF and the bottom of the switch to ON. Note: If you invert the switches and also install the product upside down, remember the load will now be controlled by the right, not the left switch.</Help>
12-
<Item label="No" value="0" />
13-
<Item label="Yes" value="1" />
10+
<Value type="bool" index="4" genre="config" label="Invert Switch" size="1" value="False">
11+
<Help>Change the top of the switch to OFF and the bottom of the switch to ON.</Help>
1412
</Value>
15-
<Value type="list" index="5" genre="config" label="Ignore Start-Level (Receiving)" size="1" value="1">
16-
<Help>This dimmer will start dimming from its current level.</Help>
17-
<Item label="No" value="0" />
18-
<Item label="Yes" value="1" />
13+
<Value type="bool" index="5" genre="config" label="Ignore Start-Level (Receiving)" size="1" value="True">
14+
<Help>This dimmer will always start dimming from its current level, ignoring any commanded start level.</Help>
1915
</Value>
2016
</CommandClass>
2117
<!-- Set correct max level for COMMAND_CLASS_SWITCH_MULTILEVEL, the dimmer will ignore any commands to set value >99 -->

‎Config/manufacturer_specific.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
<Product type="0003" id="0063" name="Smart Dimmer 6" config="aeotec/sd6.xml" />
100100
<Product type="0103" id="0063" name="Smart Dimmer 6" config="aeotec/sd6.xml" />
101101
<Product type="0203" id="0063" name="Smart Dimmer 6" config="aeotec/sd6.xml" />
102+
<Product type="1D03" id="0063" name="Smart Dimmer 6" config="aeotec/sd6.xml" />
102103
</Manufacturer>
103104
<Manufacturer id="0111" name="Airline Mechanical">
104105
<Product type="8200" id="0200" name="ZDS-100"/>
@@ -224,6 +225,9 @@
224225
<Product type="0000" id="0000" name="ED2.0 Meter Adapter"/>
225226
<Product type="0128" id="0000" name="ED2.0 Display"/>
226227
</Manufacturer>
228+
<Manufacturer id="011a" name="Enerwave">
229+
<Product type="0801" id="0b03" name="ZWN-SC7 7-Button Scene Controller" config="enerwave/zwn-sc7.xml"/>
230+
</Manufacturer>
227231
<Manufacturer id="0060" name="Everspring">
228232
<Product type="0001" id="0001" name="HSP02 Motion Detector" config="everspring/hsp02.xml"/>
229233
<Product type="0001" id="0002" name="SP814 Motion Detector" config="everspring/sp814.xml"/>
@@ -368,6 +372,7 @@
368372
<Product type="0001" id="0002" name="ZTroller" config="homeseer/ztroller.xml"/>
369373
<Product type="0002" id="0001" name="HSM100 Wireless Multi-Sensor" config="homeseer/hsm100.xml"/>
370374
<Product type="0002" id="0002" name="EZMotion+ 3-in-1 Sensor" config="homeseer/ezmotionplus.xml"/>
375+
<Product type="0004" id="0001" name="HSM200 Wireless Multi-Sensor" config="homeseer/hsm200.xml"/>
371376
</Manufacturer>
372377
<Manufacturer id="0039" name="Honeywell">
373378
<Product type="0011" id="0001" name="TH8320ZW1000 Touchscreen Thermostat" config="honeywell/th8320zw1000.xml"/>
@@ -574,10 +579,12 @@
574579
</Manufacturer>
575580
<Manufacturer id="0159" name="Qubino">
576581
<Product type="0001" id="0001" name="ZMNHDA2 Flush Dimmer" config="qubino/ZMNHDA2.xml"/>
582+
<Product type="0001" id="0051" name="ZMNHDD1 Z-Wave Plus Flush Dimmer" config="qubino/ZMNHDD1.xml"/>
577583
<Product type="0002" id="0001" name="ZMNHBA2 Flush 2 Relays" config="qubino/ZMNHBA2.xml"/>
578584
<Product type="0002" id="0051" name="ZMNHBD2 Flush 2 Relays" config="qubino/ZMNHBD2.xml"/>
579585
<Product type="0002" id="0002" name="ZMNHAA2 Flush 1 Relay" config="qubino/ZMNHAA2.xml"/>
580586
<Product type="0002" id="0052" name="ZMNHAD1 Flush 1 Relay" config="qubino/ZMNHAD1.xml"/>
587+
<Product type="0002" id="0053" name="ZMNHND1 Flush 1D relay" config="qubino/ZMNHND1.xml"/>
581588
<Product type="0003" id="0002" name="ZMNHCA2 Flush Shutter" config="qubino/ZMNHCA2.xml"/>
582589
<Product type="0004" id="0001" name="ZMNHJA2 Flush Dimmer Fil Pilote" config="qubino/ZMNHJA2.xml"/>
583590
<Product type="0005" id="0001" name="ZMNHIA2 Flush on/off thermostat" config="qubino/ZMNHIA2.xml"/>
@@ -700,8 +707,10 @@
700707
<Product type="0002" id="0002" name="TSP01 3 in 1 PIR Motion Sensor" config="wenzhou/tsp01.xml" />
701708
<Product type="0808" id="0808" name="TZ65D Dual Wall Dimmer" config="wenzhou/tz65d.xml"/>
702709
<Product type="0101" id="0103" name="TZ68E On/Off Switch Socket"/>
710+
<Product type="0101" id="0103" name="TZ68 On/Off Switch Socket" config="wenzhou/tz68.xml"/>
703711
<Product type="0102" id="1020" name="TZ66D Dual Wall Switch" config="wenzhou/tz66d.xml"/>
704712
<Product type="0202" id="0611" name="TZ67 Wall Plug Dimmer" config="wenzhou/tz67.xml"/>
713+
705714
</Manufacturer>
706715
<Manufacturer id="0149" name="wiDom">
707716
<Product type="0012" id="0104" name="UBS104 Universal Relay Switch" config="widom/UBS104.xml"/>

0 commit comments

Comments
 (0)