Skip to content

Commit f447dde

Browse files
author
dotms
committed
Merge from development.
2 parents 765037e + ff40091 commit f447dde

Some content is hidden

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

69 files changed

+2580
-1724
lines changed

‎Config/aeotec/zw111.xml

Lines changed: 68 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--
3-
Aeotec ZW111 Nano Dimmer, base on Engineering Spec 12/07/2016
3+
Aeotec ZW111 Nano Dimmer, base on Engineering Spec 3/6/2018
44
Product Type ID: EU=0x00, US=0x01, AU=0x02 CN=0x1D
55
https://aeotec.freshdesk.com/helpdesk/attachments/6048080397
66
-->
@@ -35,13 +35,30 @@ https://aeotec.freshdesk.com/helpdesk/attachments/6048080397
3535
<Help>To set which notification would be sent to the associated nodes in association group 3 when using the external switch 1 to switch the loads</Help>
3636
<Item label="None" value="0"/>
3737
<Item label="Basic" value="1"/>
38+
<Item label="Switch Multilevel Set" value="2"/>
3839
</Value>
3940
<Value type="list" index="82" genre="config" label="Notification report using the external switch 2" units="" size="1" value="1">
4041
<Help>To set which notification would be sent to the associated nodes in association group 4 when using the external switch 2 to switch the loads</Help>
4142
<Item label="None" value="0"/>
4243
<Item label="Basic" value="1"/>
43-
</Value>
44-
<Value type="int" index="85" genre="config" label="State appointment 1" value="2566920192">
44+
<Item label="Switch Multilevel Set" value="2"/>
45+
</Value>
46+
<Value type="list" index="83" genre="config" label="LED status" units="" size="1" value="0">
47+
<Help>Configure the state of LED when it is in 3 modes below</Help>
48+
<Item label="The LED will follow the status" value="0"/>
49+
<Item label="LED will follow the status (on/off) of its load but the LED will turn off after 5 seconds" value="1"/>
50+
<Item label="Night light mode" value="2"/>
51+
</Value>
52+
<Value type="int" index="84" genre="config" label="Time set for Night light mode" value="301991936">
53+
<Help>
54+
Value1: Hour of ON.
55+
Value2: Minute of ON.
56+
Value3: Hour of OFF.
57+
Value4: Minute of OFF.
58+
E.g. The default setting is the Night light mode is enabled at 12: 00 and disabled at 8:00 0x12000800.
59+
</Help>
60+
</Value>
61+
<Value type="int" index="85" genre="config" label="State appointment 1" value="1179747">
4562
<Help>State appointment
4663
Set the ON time of output load.
4764
Value1 = 0, disable or = non zero, enable (day, bit0 - bit6 represent Mon to Sun).
@@ -50,7 +67,7 @@ https://aeotec.freshdesk.com/helpdesk/attachments/6048080397
5067
Value4 = ON (brightness level)
5168
</Help>
5269
</Value>
53-
<Value type="int" index="86" genre="config" label="State appointment 2" value="8960">
70+
<Value type="int" index="86" genre="config" label="State appointment 2" value="1507328">
5471
<Help>State appointment
5572
Set the ON time of output load.
5673
Value1 = 0, disable or = non zero, enable (day, bit0 - bit6 represent Mon to Sun).
@@ -84,10 +101,10 @@ https://aeotec.freshdesk.com/helpdesk/attachments/6048080397
84101
Value 2 Reserved
85102
Value 3 Reserved
86103
Value 4 (lsb) bits 7-4 reserved
87-
bit 3 current
88-
bit 2 voltage
89-
bit 1 watt
90-
bit 0 kWh
104+
bit 3 kWh
105+
bit 2 watt
106+
bit 1 current
107+
bit 0 voltage
91108
</Help>
92109
</Value>
93110
<Value type="int" index="102" genre="config" label="Report type sent in Reporting Group 2" units="" value="0">
@@ -101,10 +118,10 @@ https://aeotec.freshdesk.com/helpdesk/attachments/6048080397
101118
Value 2 Reserved
102119
Value 3 Reserved
103120
Value 4 (lsb) bits 7-4 reserved
104-
bit 3 current
105-
bit 2 voltage
106-
bit 1 watt
107-
bit 0 kWh
121+
bit 3 kWh
122+
bit 2 watt
123+
bit 1 current
124+
bit 0 voltage
108125
</Help>
109126
</Value>
110127
<Value type="int" index="103" genre="config" label="Report type sent in Reporting Group 3" units="" value="0">
@@ -118,10 +135,10 @@ https://aeotec.freshdesk.com/helpdesk/attachments/6048080397
118135
Value 2 Reserved
119136
Value 3 Reserved
120137
Value 4 (lsb) bits 7-4 reserved
121-
bit 3 current
122-
bit 2 voltage
123-
bit 1 watt
124-
bit 0 kWh
138+
bit 3 kWh
139+
bit 2 watt
140+
bit 1 current
141+
bit 0 voltage
125142
</Help>
126143
</Value>
127144
<Value type="button" index="110" genre="config" label="Set 111-113 to default" units="" write_only="true" value="0" affects="111,112,113">
@@ -139,20 +156,20 @@ https://aeotec.freshdesk.com/helpdesk/attachments/6048080397
139156
<Value type="list" index="120" genre="config" label="Set the external switch mode for S1" units="" min="0" max="4" size="1" value="0">
140157
<Help>When the mode is determined, this mode value will not be reset after exclusion</Help>
141158
<Item label="Unidentified" value="0"/>
142-
<Item label="2-state switch" value="1"/>
143-
<Item label="3-way switch" value="2"/>
144-
<Item label="Momentary button" value="3"/>
145-
<Item label="Enter automatic identification" value="4"/>
159+
<Item label="2-state switch" value="1"/>
160+
<Item label="3-way switch" value="2"/>
161+
<Item label="Push button" value="3"/>
162+
<Item label="Automatic identification mode" value="4"/>
146163
</Value>
147164
<Value type="list" index="121" genre="config" label="Set the external switch mode for S2" units="" min="0" max="4" size="1" value="0">
148165
<Help>When the mode is determined, this mode value will not be reset after exclusion</Help>
149166
<Item label="Unidentified" value="0"/>
150-
<Item label="2-state switch" value="1"/>
151-
<Item label="3-way switch" value="2"/>
152-
<Item label="Momentary button" value="3"/>
153-
<Item label="Enter automatic identification" value="4"/>
167+
<Item label="2-state switch" value="1"/>
168+
<Item label="3-way switch" value="2"/>
169+
<Item label="Push button" value="3"/>
170+
<Item label="Automatic identification mode" value="4"/>
154171
</Value>
155-
<Value type="list" index="122" genre="config" label="Touch panel port state" units="" min="0" max="5" size="1" value="0" read_only="true">
172+
<Value type="list" index="122" genre="config" label="Touch panel" units="" min="0" max="5" size="1" value="0" read_only="true">
156173
<Help>Get the state of touch panel port</Help>
157174
<Item label="Not connected" value="0"/>
158175
<Item label="Connected" value="5"/>
@@ -190,12 +207,36 @@ https://aeotec.freshdesk.com/helpdesk/attachments/6048080397
190207
<Item label="Capacitive load" value="2"/>
191208
<Item label="Inductive load" value="3"/>
192209
</Value>
193-
<Value type="byte" index="131" genre="config" label="Min brightness level" units="%" min="0" max="99" value="20">
210+
<Value type="byte" index="131" genre="config" label="Min brightness level" units="%" min="0" max="99" value="0">
194211
<Help>Set the min brightness level that the load can reach to</Help>
195212
</Value>
196-
<Value type="byte" index="132" genre="config" label="Max brightness level" units="%" min="0" max="99" value="95">
213+
<Value type="byte" index="132" genre="config" label="Max brightness level" units="%" min="0" max="99" value="99">
197214
<Help>Set the max brightness level that the load can reach to</Help>
198215
</Value>
216+
<Value type="byte" index="247" genre="config" label="Working way for S1/S2" value="0">
217+
<Help>
218+
Set the working way for S1/S2 when the Switch mode is 2 state switch mode.
219+
Bit 0 =0, S1 is a toggle switch.
220+
Bit 0 =1, S1 is an On/Off switch, the out load state and S1 switch state would be in sync when using S1 to control the output load.
221+
Bit 1 =0, S2 is a toggle switch.
222+
Bit 1 =1, S2 is an On/Off switch, the out load state and S2 switch state would be in sync when using S2 to control the output load.
223+
Bit 2- Bit 7, reserved.
224+
</Help>
225+
</Value>
226+
<Value type="byte" index="248" genre="config" label="Function of S1/S2" value="131">
227+
<Help>
228+
Set the function of S1/S2.
229+
Bit 0 = 0, the function of sending NIF is disabled.
230+
Bit 0 = 1, the function of sending NIF is enabled.
231+
Bit 1 = 0, the function of entering RF power level test mode is disabled.
232+
Bit 1 = 1, the function of entering RF power level test mode is enabled.
233+
Bit 2 = 0, the function of factory reset is disabled.
234+
Bit 2 = 1, the function of factory reset is enabled.
235+
Bit 3- Bit 6 = reserved.
236+
Bit 7 = 0, the setting for Bit 0 -Bit 2 are ineffective.
237+
Bit 7 = 1, the setting for Bit 0 -Bit 2 are effective.
238+
</Help>
239+
</Value>
199240
<Value type="list" index="249" genre="config" label="Recognition way of load" units="" min="0" max="2" size="1" value="2">
200241
<Help>Set the recognition way of load</Help>
201242
<Item label="Never recognize the load when power on" value="0"/>

‎Config/aeotec/zw132.xml

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--
3-
Aeotec ZW132 Dual Nano Switch, base on Engineering Spec 02/27/2017
3+
Aeotec ZW132 Dual Nano Switch, base on Engineering Spec 08/23/2017
44
Product Type ID: EU=0x00, US=0x01, AU=0x02 CN=0x1D
55
-->
66
<Product xmlns='http://code.google.com/p/open-zwave/'>
@@ -179,25 +179,38 @@ Product Type ID: EU=0x00, US=0x01, AU=0x02 CN=0x1D
179179
<Value type="int" index="113" genre="config" label="Send Interval for Reporting Group 3" units="seconds" min="0" max="2147483647" value="600">
180180
<Help>Defines the time interval when the defined report for group 3 is sent.</Help>
181181
</Value>
182-
<Value type="list" index="120" genre="config" label="Set the external S1 mode" units="" min="0" max="3" size="1" value="0">
182+
<Value type="list" index="120" genre="config" label="Set the external S1 mode" units="" min="0" max="4" size="1" value="0">
183183
<Help>When the switch mode of S1 is determined or identified or configured, this mode value will not be reset after exclusion</Help>
184-
<Item label="Enter automatic identification" value="0"/>
184+
<Item label="Unidentified" value="0"/>
185185
<Item label="2-state switch" value="1"/>
186186
<Item label="3-way switch" value="2"/>
187-
<Item label="momentary button" value="3"/>
187+
<Item label="Push button" value="3"/>
188+
<Item label="Automatic identification mode" value="4"/>
188189
</Value>
189-
<Value type="list" index="121" genre="config" label="Set the external S2 mode" units="" min="0" max="3" size="1" value="0">
190+
<Value type="list" index="121" genre="config" label="Set the external S2 mode" units="" min="0" max="4" size="1" value="0">
190191
<Help>When the switch mode of S2 is determined or identified or configured, this mode value will not be reset after exclusion</Help>
191-
<Item label="Enter automatic identification" value="0"/>
192+
<Item label="Unidentified" value="0"/>
192193
<Item label="2-state switch" value="1"/>
193194
<Item label="3-way switch" value="2"/>
194-
<Item label="momentary button" value="3"/>
195-
</Value>
196-
<Value type="list" index="122" genre="config" label="Set the control destination of the external switch" units="" min="0" max="3" size="1" value="3">
197-
<Help></Help>
198-
<Item label="Control itself" value="1"/>
199-
<Item label="Control other nodes in the same network" value="2"/>
200-
<Item label="Control itself and other nodes in the same network" value="3"/>
195+
<Item label="Push button" value="3"/>
196+
<Item label="Automatic identification mode" value="4"/>
197+
</Value>
198+
<Value type="list" index="122" genre="config" label="Control destination for S1" units="" min="0" max="3" size="1" value="3">
199+
<Help>Set the control destination for external switch S1</Help>
200+
<Item label="Control the output load itself" value="1"/>
201+
<Item label="Control other nodes" value="2"/>
202+
<Item label="Control the output load itself and other nodes" value="3"/>
203+
</Value>
204+
<Value type="list" index="123" genre="config" label="Control destination for S2" units="" min="0" max="3" size="1" value="3">
205+
<Help>Set the control destination for external switch S2</Help>
206+
<Item label="Control the output load itself" value="1"/>
207+
<Item label="Control other nodes" value="2"/>
208+
<Item label="Control the output load itself and other nodes" value="3"/>
209+
</Value>
210+
<Value type="list" index="251" genre="config" label="Factory reset function of Action" units="" min="0" max="1" size="1" value="1">
211+
<Help>Enable/disable the factory reset function of Action</Help>
212+
<Item label="Disable" value="0"/>
213+
<Item label="Enable" value="1"/>
201214
</Value>
202215
<Value type="list" index="252" genre="config" label="Configuration Locked" units="" min="0" max="1" size="1" value="0">
203216
<Help>Enable/disable Configuration Locked</Help>

‎Config/aeotec/zw140.xml

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--
3-
Aeotec ZW140 Dual Nano Switch, base on Engineering Spec 01/10/2016
3+
Aeotec ZW140 Dual Nano Switch, base on Engineering Spec 06/02/2017
44
Product Type ID: EU=0x00, US=0x01, AU=0x02 CN=0x1D
55
-->
66
<Product xmlns='http://code.google.com/p/open-zwave/'>
@@ -18,7 +18,10 @@ Product Type ID: EU=0x00, US=0x01, AU=0x02 CN=0x1D
1818
<Item label="Always off" value="2"/>
1919
</Value>
2020
<Value type="list" index="80" genre="config" label="Notification report association group 1" units="" size="1" value="3">
21-
<Help>To set which notification would be sent to the associated nodes in association group 1 when the state of output load is changed</Help>
21+
<Help>
22+
To set which notification would be sent to the associated nodes in association group 1 when the state of output load is changed.
23+
Note: When just only one channel load state is changed, the report message Hail CC or Basic Report CC would be Multi Channel encapsulated.
24+
</Help>
2225
<Item label="None" value="0"/>
2326
<Item label="Hail" value="1"/>
2427
<Item label="Basic" value="2"/>
@@ -67,27 +70,38 @@ Product Type ID: EU=0x00, US=0x01, AU=0x02 CN=0x1D
6770
E.g. The default setting 0x001707F00
6871
</Help>
6972
</Value>
70-
<Value type="list" index="120" genre="config" label="Set the external S1 mode" units="" min="0" max="3" size="1" value="0">
73+
<Value type="list" index="120" genre="config" label="Set the external S1 mode" units="" min="0" max="4" size="1" value="0">
7174
<Help>When the switch mode of S1 is determined or identified or configured, this mode value will not be reset after exclusion</Help>
72-
<Item label="Unknown switch mode" value="0"/>
75+
<Item label="Unidentified" value="0"/>
7376
<Item label="2-state switch" value="1"/>
7477
<Item label="3-way switch" value="2"/>
75-
<Item label="Momentary button" value="3"/>
78+
<Item label="Push button" value="3"/>
7679
<Item label="Automatic identification mode" value="4"/>
7780
</Value>
78-
<Value type="list" index="121" genre="config" label="Set the external S2 mode" units="" min="0" max="3" size="1" value="0">
81+
<Value type="list" index="121" genre="config" label="Set the external S2 mode" units="" min="0" max="4" size="1" value="0">
7982
<Help>When the switch mode of S2 is determined or identified or configured, this mode value will not be reset after exclusion</Help>
80-
<Item label="Unknown switch mode" value="0"/>
83+
<Item label="Unidentified" value="0"/>
8184
<Item label="2-state switch" value="1"/>
8285
<Item label="3-way switch" value="2"/>
83-
<Item label="Momentary button" value="3"/>
86+
<Item label="Push button" value="3"/>
8487
<Item label="Automatic identification mode" value="4"/>
8588
</Value>
86-
<Value type="list" index="122" genre="config" label="Set the control destination of the external switch" units="" min="0" max="3" size="1" value="3">
87-
<Help></Help>
88-
<Item label="Control itself" value="1"/>
89-
<Item label="Control other nodes in the same network" value="2"/>
90-
<Item label="Control itself and other nodes in the same network" value="3"/>
89+
<Value type="list" index="122" genre="config" label="Control destination for S1" units="" min="0" max="3" size="1" value="3">
90+
<Help>Set the control destination for external switch S1</Help>
91+
<Item label="Control the output load itself" value="1"/>
92+
<Item label="Control other nodes" value="2"/>
93+
<Item label="Control the output load itself and other nodes" value="3"/>
94+
</Value>
95+
<Value type="list" index="123" genre="config" label="Control destination for S2" units="" min="0" max="3" size="1" value="3">
96+
<Help>Set the control destination for external switch S2</Help>
97+
<Item label="Control the output load itself" value="1"/>
98+
<Item label="Control other nodes" value="2"/>
99+
<Item label="Control the output load itself and other nodes" value="3"/>
100+
</Value>
101+
<Value type="list" index="251" genre="config" label="Factory reset function of Action" units="" min="0" max="1" size="1" value="1">
102+
<Help>Enable/disable the factory reset function of Action</Help>
103+
<Item label="Disable" value="0"/>
104+
<Item label="Enable" value="1"/>
91105
</Value>
92106
<Value type="list" index="252" genre="config" label="Configuration Locked" units="" min="0" max="1" size="1" value="0">
93107
<Help>Enable/disable Configuration Locked</Help>

‎Config/aeotec/zwa001.xml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
ZWA001 LED Bulb 6 Multi-White
4+
-->
5+
<Product xmlns='http://code.google.com/p/open-zwave/'>
6+
<!-- Configuration Parameters -->
7+
<CommandClass id="112">
8+
<Value type="list" index="80" genre="config" label="Notification" min="0" max="1" value="1" size="1">
9+
<Help>Enable to send notifications to associated devices (Group 1) when the state of LED Bulb is changed.</Help>
10+
<Item label="Nothing" value="0" />
11+
<Item label="Basic CC report" value="1" />
12+
</Value>
13+
<Value type="short" index="81" genre="config" label="Warm White temperature" min="2700" max="4999" units="k" value="2700" size="2">
14+
<Help>
15+
Adjusting the color temperature in warm white color component.
16+
available value: 2700k to 4999k</Help>
17+
</Value>
18+
<Value type="short" index="82" genre="config" label="cold white temperature" min="5000" max="6500" units="k" value="6500" size="2">
19+
<Help>
20+
Adjusting the color temperature in cold white color component.
21+
available value:5000k to 6500k
22+
</Help>
23+
</Value>
24+
</CommandClass>
25+
<!-- Association Groups -->
26+
<CommandClass id="133">
27+
<Associations num_groups="1">
28+
<Group index="1" max_associations="1" label="Lifeline" />
29+
</Associations>
30+
</CommandClass>
31+
</Product>

‎Config/august/asl-03.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Product xmlns='http://code.google.com/p/open-zwave/'>
3+
<!-- Association Groups -->
4+
<CommandClass id="133">
5+
<Associations num_groups="2">
6+
<Group index="1" max_associations="5" label="Lifeline" />
7+
<Group index="2" max_associations="5" label="Doorlock OP" />
8+
</Associations>
9+
</CommandClass>
10+
</Product>

‎Config/device_configuration.xsd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@
138138
<xs:attribute name='mapping' type='xs:string' use='optional'/>
139139
<xs:attribute name='ignoreUnsolicitedMultiChnCapReport' type='xs:string' use='optional'/>
140140
<xs:attribute name='codes' type='xs:string' use='optional'/>
141+
<xs:attribute name='colorchannels' type='xs:string' use='optional'/>
141142
</xs:complexType>
142143
</xs:element>
143144

‎Config/fibaro/fgdw2.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
5-32400 - time in seconds
8181
</Help>
8282
</Value>
83-
<Value type="int" genre="config" instance="1" index="53" label="Temperature offset" value="0" min="-1000" max="1000" size="4">
83+
<Value type="short" genre="config" instance="1" index="53" label="Temperature offset" value="0" min="-1000" max="1000" size="2">
8484
<Help>The value to be added to the actual temperature, measured by the sensor (temperature compensation). (0.1C steps)
8585
</Help>
8686
</Value>

0 commit comments

Comments
 (0)