GitHub-Mirror/open-zwave
2
0
Fork 0
mirror of https://github.com/Fishwaldo/open-zwave.git synced 2025-03-15 11:31:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fibaro Walli Double Switch and Dimmer: fix definition of params 30-34

Browse source 
Solves https://github.com/domoticz/domoticz/issues/3557
This commit is contained in:
Peter Gebruers 2019-09-06 12:09:25 +02:00
parent 29b82367ef
commit cc7a277c1c
3 changed files with 59 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
config/fibaro/fgwd111.xml
View file

@ -1,4 +1,4 @@
<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
<!-- Please refer to https://github.com/OpenZWave/open-zwave/wiki/Adding-Devices for instructions -->
<MetaData>
<MetaDataItem name="Name">FGWDEU-111 Walli Dimmer</MetaDataItem>
@ -34,6 +34,7 @@
<MetaDataItem id="1000" name="FrequencyName" type="1C01">CEPT (Europe)</MetaDataItem>
<ChangeLog>
<Entry author="Makooy - marc@makooy.nl" date="10 July 2019" revision="1">Initial Creation of config file - https://products.z-wavealliance.org/Products/3392/XML</Entry>
<Entry author="Peter Gebruers - peter.gebruers@gmail.com" date="06 September 2019" revision="2">Change definition of params 30-34 to fix https://github.com/domoticz/domoticz/issues/3557</Entry>
</ChangeLog>
</MetaData>
@ -103,45 +104,36 @@
<Item label="Default (1st button brightens, 2nd button dims)" value="0"/>
<Item label="Reversed (1st button dims, 2nd button brightens)" value="1"/>
</Value>
<Value genre="config" index="30" label="Alarm configuration - 1st slot" max="4" min="1" size="4" type="list" value="0">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.</Help>
<Item label="[MSB] – Notification Type" value="1"/>
<Item label="Notification Value" value="2"/>
<Item label="Event/State Parameters" value="3"/>
<Item label="[LSB] – Action" value="4"/>
<Value type="int" index="30" genre="config" label="Alarm configuration - 1st slot" value="0" min="0" max="4294967295">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
1B: [MSB] Notification Type, 2B: Notification Status, 3B: Event/State Parameters, 4B: [LSB] action
0xX0: no action on output, 0xX1: turn ON, 0xX2: turn OFF, 0xX3: turn ON/OFF continuously, 0x0X: no action on LED frame, 0x1X: LED frame blinks red, 0x2X: LED frame blinks green, 0x4X: LED frame blinks blue, 0x8X: disable LED frame, 0xFX: LED frame LAPD signal (red-white-blue)
</Help>
</Value>
<Value genre="config" index="31" label="Alarm configuration - 2nd slot" max="4" min="1" size="4" type="list" value="0">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.</Help>
<Item label="[MSB] – Notification Type" value="1"/>
<Item label="Notification Value" value="2"/>
<Item label="Event/State Parameters" value="3"/>
<Item label="[LSB] – Action" value="4"/>
<Value type="int" index="31" genre="config" label="Alarm configuration - 2nd slot" value="0" min="0" max="4294967295">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
1B: [MSB] Notification Type, 2B: Notification Status, 3B: Event/State Parameters, 4B: [LSB] action
0xX0: no action on output, 0xX1: turn ON, 0xX2: turn OFF, 0xX3: turn ON/OFF continuously, 0x0X: no action on LED frame, 0x1X: LED frame blinks red, 0x2X: LED frame blinks green, 0x4X: LED frame blinks blue, 0x8X: disable LED frame, 0xFX: LED frame LAPD signal (red-white-blue)
</Help>
</Value>
<Value genre="config" index="32" label="Alarm configuration - 3rd slot" max="4" min="1" size="4" type="list" value="0">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.</Help>
<Item label="[MSB] – Notification Type" value="1"/>
<Item label="Notification Value" value="2"/>
<Item label="Event/State Parameters" value="3"/>
<Item label="[LSB] – Action" value="4"/>
<Value type="int" index="32" genre="config" label="Alarm configuration - 3rd slot" value="0" min="0" max="4294967295">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
1B: [MSB] Notification Type, 2B: Notification Status, 3B: Event/State Parameters, 4B: [LSB] action
0xX0: no action on output, 0xX1: turn ON, 0xX2: turn OFF, 0xX3: turn ON/OFF continuously, 0x0X: no action on LED frame, 0x1X: LED frame blinks red, 0x2X: LED frame blinks green, 0x4X: LED frame blinks blue, 0x8X: disable LED frame, 0xFX: LED frame LAPD signal (red-white-blue)
</Help>
</Value>
<Value genre="config" index="33" label="Alarm configuration - 4th slot" max="4" min="1" size="4" type="list" value="0">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.</Help>
<Item label="[MSB] – Notification Type" value="1"/>
<Item label="Notification Value" value="2"/>
<Item label="Event/State Parameters" value="3"/>
<Item label="[LSB] – Action" value="4"/>
<Value type="int" index="33" genre="config" label="Alarm configuration - 4th slot" value="0" min="0" max="4294967295">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
1B: [MSB] Notification Type, 2B: Notification Status, 3B: Event/State Parameters, 4B: [LSB] action
0xX0: no action on output, 0xX1: turn ON, 0xX2: turn OFF, 0xX3: turn ON/OFF continuously, 0x0X: no action on LED frame, 0x1X: LED frame blinks red, 0x2X: LED frame blinks green, 0x4X: LED frame blinks blue, 0x8X: disable LED frame, 0xFX: LED frame LAPD signal (red-white-blue)
</Help>
</Value>
<Value genre="config" index="34" label="Alarm configuration - 5th slot" max="4" min="1" size="4" type="list" value="0">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.</Help>
<Item label="[MSB] – Notification Type" value="1"/>
<Item label="Notification Value" value="2"/>
<Item label="Event/State Parameters" value="3"/>
<Item label="[LSB] – Action" value="4"/>
<Value type="int" index="34" genre="config" label="Alarm configuration - 5th slot" value="0" min="0" max="4294967295">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
1B: [MSB] Notification Type, 2B: Notification Status, 3B: Event/State Parameters, 4B: [LSB] action
0xX0: no action on output, 0xX1: turn ON, 0xX2: turn OFF, 0xX3: turn ON/OFF continuously, 0x0X: no action on LED frame, 0x1X: LED frame blinks red, 0x2X: LED frame blinks green, 0x4X: LED frame blinks blue, 0x8X: disable LED frame, 0xFX: LED frame LAPD signal (red-white-blue)
</Help>
</Value>
<Value genre="config" index="35" label="Alarm configuration – duration" max="32400" min="0" size="2" type="short" value="600">

62
config/fibaro/fgwds221.xml
View file

@ -1,4 +1,4 @@
<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
<Product Revision="2" xmlns="https://github.com/OpenZWave/open-zwave">
<!-- Please refer to https://github.com/OpenZWave/open-zwave/wiki/Adding-Devices for instructions -->
<MetaData>
<MetaDataItem name="Name">FGWDSEU-221 Walli Double Switch</MetaDataItem>
@ -34,6 +34,7 @@
<MetaDataItem id="1000" name="FrequencyName" type="1B01">CEPT (Europe)</MetaDataItem>
<ChangeLog>
<Entry author="Makooy - marc@makooy.nl" date="07 July 2019" revision="1">Initial Creation of config file - https://products.z-wavealliance.org/Products/3395/XML</Entry>
<Entry author="Peter Gebruers - peter.gebruers@gmail.com" date="06 September 2019" revision="2">Change definition of params 30-34 to fix https://github.com/domoticz/domoticz/issues/3557</Entry>
</ChangeLog>
</MetaData>
@ -124,44 +125,35 @@
<Item label="Reversed (Q1 - 2nd channel, Q2 - 1st channel)" value="1"/>
</Value>
<Value genre="config" index="30" label="Alarm configuration - 1st slot" max="4" min="1" size="4" type="list" value="0">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.</Help>
<Item label="[MSB] – Notification Type" value="1"/>
<Item label="Notification Value" value="2"/>
<Item label="Event/State Parameters" value="3"/>
<Item label="[LSB] – Action" value="4"/>
<Value type="int" index="30" genre="config" label="Alarm configuration - 1st slot" value="0" min="0" max="4294967295">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
1B: [MSB] Notification Type, 2B: Notification Status, 3B: Event/State Parameters, 4B: [LSB] action
0xX0: no action on output, 0xX1: turn ON, 0xX2: turn OFF, 0xX3: turn ON/OFF continuously, 0x0X: no action on LED frame, 0x1X: LED frame blinks red, 0x2X: LED frame blinks green, 0x4X: LED frame blinks blue, 0x8X: disable LED frame, 0xFX: LED frame LAPD signal (red-white-blue)
</Help>
</Value>
<Value genre="config" index="31" label="Alarm configuration - 2nd slot" max="4" min="1" size="4" type="list" value="0">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.</Help>
<Item label="[MSB] – Notification Type" value="1"/>
<Item label="Notification Value" value="2"/>
<Item label="Event/State Parameters" value="3"/>
<Item label="[LSB] – Action" value="4"/>
<Value type="int" index="31" genre="config" label="Alarm configuration - 2nd slot" value="0" min="0" max="4294967295">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
1B: [MSB] Notification Type, 2B: Notification Status, 3B: Event/State Parameters, 4B: [LSB] action
0xX0: no action on output, 0xX1: turn ON, 0xX2: turn OFF, 0xX3: turn ON/OFF continuously, 0x0X: no action on LED frame, 0x1X: LED frame blinks red, 0x2X: LED frame blinks green, 0x4X: LED frame blinks blue, 0x8X: disable LED frame, 0xFX: LED frame LAPD signal (red-white-blue)
</Help>
</Value>
<Value genre="config" index="32" label="Alarm configuration - 3rd slot" max="4" min="1" size="4" type="list" value="0">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.</Help>
<Item label="[MSB] – Notification Type" value="1"/>
<Item label="Notification Value" value="2"/>
<Item label="Event/State Parameters" value="3"/>
<Item label="[LSB] – Action" value="4"/>
<Value type="int" index="32" genre="config" label="Alarm configuration - 3rd slot" value="0" min="0" max="4294967295">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
1B: [MSB] Notification Type, 2B: Notification Status, 3B: Event/State Parameters, 4B: [LSB] action
0xX0: no action on output, 0xX1: turn ON, 0xX2: turn OFF, 0xX3: turn ON/OFF continuously, 0x0X: no action on LED frame, 0x1X: LED frame blinks red, 0x2X: LED frame blinks green, 0x4X: LED frame blinks blue, 0x8X: disable LED frame, 0xFX: LED frame LAPD signal (red-white-blue)
</Help>
</Value>
<Value genre="config" index="33" label="Alarm configuration - 4th slot" max="4" min="1" size="4" type="list" value="0">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.</Help>
<Item label="[MSB] – Notification Type" value="1"/>
<Item label="Notification Value" value="2"/>
<Item label="Event/State Parameters" value="3"/>
<Item label="[LSB] – Action" value="4"/>
<Value type="int" index="33" genre="config" label="Alarm configuration - 4th slot" value="0" min="0" max="4294967295">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
1B: [MSB] Notification Type, 2B: Notification Status, 3B: Event/State Parameters, 4B: [LSB] action
0xX0: no action on output, 0xX1: turn ON, 0xX2: turn OFF, 0xX3: turn ON/OFF continuously, 0x0X: no action on LED frame, 0x1X: LED frame blinks red, 0x2X: LED frame blinks green, 0x4X: LED frame blinks blue, 0x8X: disable LED frame, 0xFX: LED frame LAPD signal (red-white-blue)
</Help>
</Value>
<Value genre="config" index="34" label="Alarm configuration - 5th slot" max="4" min="1" size="4" type="list" value="0">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.</Help>
<Item label="[MSB] – Notification Type" value="1"/>
<Item label="Notification Value" value="2"/>
<Item label="Event/State Parameters" value="3"/>
<Item label="[LSB] – Action" value="4"/>
<Value type="int" index="34" genre="config" label="Alarm configuration - 5th slot" value="0" min="0" max="4294967295">
<Help>This parameter determines to which alarm frames and how the device should react. The parameters consist of 4 bytes, three most significant bytes are set according to the official Z-Wave protocol specification.
1B: [MSB] Notification Type, 2B: Notification Status, 3B: Event/State Parameters, 4B: [LSB] action
0xX0: no action on output, 0xX1: turn ON, 0xX2: turn OFF, 0xX3: turn ON/OFF continuously, 0x0X: no action on LED frame, 0x1X: LED frame blinks red, 0x2X: LED frame blinks green, 0x4X: LED frame blinks blue, 0x8X: disable LED frame, 0xFX: LED frame LAPD signal (red-white-blue)
</Help>
</Value>
<Value genre="config" index="35" label="Alarm configuration – duration" max="32400" min="0" size="2" type="short" value="600">

8
cpp/build/testconfigversions.cfg
View file

@ -992,12 +992,12 @@
'md5' => '64b989c2046a0c572b8e25ee2c3c595e1a5c2eb52e9c6a29d96cbe0c71b33d4a46bd640e551564e6794aeab9a5e7a9a011c0e7430ab2b52de518ba9cac81c3b4'
},
'config/fibaro/fgwd111.xml' => {
'Revision' => '1',
'md5' => '37e51ba47f025d4159a31eb33dbd61fd520b453e724c865b8a0f25ed33c4bd1552917270c56bc613271e11709d55d4636cf43735e446d17c4838ea0522842a2a'
'Revision' => 2,
'md5' => 'bf6d95da83aad31068f0f62fb3abf1d03481f63dcaa347f8fe6a38cc8d4a2bd9a3031722f9a4e73cd6823dc151fdf30772c4c3b5d4f06bdc6df3120389091057'
},
'config/fibaro/fgwds221.xml' => {
'Revision' => '1',
'md5' => '0c53fbe507f4ee53f45f9c9b4136f03aef96c60e1af240331b90d582787bbce2bd9a2e6c300bd49d66ea081ed54160dc005c5df6c4f4382e3f4a0ff475284805'
'Revision' => 2,
'md5' => 'cf74c8f1c18eb10c407b306c1b8d6faa536f8d9c1a7f21e1bb90c28e1502054b52a0970f820b118be2e235c34b57aeb66050b653255b48ea4aa1f811b4a20c7f'
},
'config/fibaro/fgwoe.xml' => {
'Revision' => '1',