Merge branch 'OpenZWave:master' into feature/Fix_kwh_Neo_Coolcam_NAS-…

…WR01ZE
OpenZWave · Oct 11, 2021 · 38ce4e9 · 38ce4e9
2 parents 8a19338 + e5ed77c
commit 38ce4e9
Show file tree

Hide file tree

Showing 38 changed files with 1,627 additions and 176 deletions.
diff --git a/config/aeotec/zw100.xml b/config/aeotec/zw100.xml
diff --git a/config/aeotec/zw141.xml b/config/aeotec/zw141.xml
@@ -3,7 +3,7 @@ Aeotec ZW141 Nano Shutter, based on Engineering Spec 8/22/2019
 Product Type ID: EU=0x00, US=0x01, AU=0x02 CN=0x1D
 
 -->
-<Product Revision="7" xmlns="https://github.com/OpenZWave/open-zwave">
+<Product Revision="8" xmlns="https://github.com/OpenZWave/open-zwave">
   <MetaData>
     <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0086:008D:0103</MetaDataItem>
     <MetaDataItem name="ProductPic">images/aeotec/zw141.png</MetaDataItem>
@@ -41,7 +41,8 @@ Product Type ID: EU=0x00, US=0x01, AU=0x02 CN=0x1D
       <Entry author="Justin Hammond - [email protected]" date="02 Jun 2019" revision="4">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2953/xml</Entry>
       <Entry author="Justin Hammond - [email protected]" date="03 Jun 2019" revision="5">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/3075/xml</Entry>
       <Entry author="Duy Nguyen - [email protected]" date="16 Feb 2020" revision="6">Updated Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/Products/3693/XML</Entry>	    
-      <Entry author="Matej Drobnič - [email protected]" date="02 Oct 2020" revision="7">Fixed timing types, Fixed button list types</Entry>	    
+      <Entry author="Matej Drobnič - [email protected]" date="02 Oct 2020" revision="7">Fixed timing types, Fixed button list types</Entry>	 
+      <Entry author="Jean-François Auger - [email protected]" date="14 Apr 2021" revision="8">Add missing list item for param 22</Entry>	
     </ChangeLog>
     <MetaDataItem id="008D" name="FrequencyName" type="0103">U.S. / Canada / Mexico</MetaDataItem>
     <MetaDataItem id="008D" name="Identifier" type="0103">ZW141-A</MetaDataItem>
@@ -56,8 +57,12 @@ Product Type ID: EU=0x00, US=0x01, AU=0x02 CN=0x1D
       <Item label="Move to 99%" value="1" />
       <Item label="Move to 0%" value="2" />
     </Value>	
-    <Value genre="config" index="22" label="Motor direction" size="1" type="list" units="" value="2">
+    <Value genre="config" index="22" label="Motor direction" size="1" type="list" value="0">
       <Help>Set to toggle the motor running direction</Help>
+      <Item label="Shutter/Venetian: Out 1= Up, Out 2= Down" value="0" />
+      <Item label="Shutter: Out 1= Down, Out 2= Up. Venetian: Out 1= Up, Out 2= Down" value="1" />
+      <Item label="Shutter: Out 1= Up, Out 2= Down. Venetian: Out 1= Down, Out 2= Up" value="2" />
+      <Item label="Shutter/Venetian: Out 1= Down, Out 2= Up" value="3" />      
     </Value>
     <Value genre="config" index="34" label="Blade turn time" size="2" max="32767" min="10" type="short" units="0.01 seconds" value="150">
       <Help>Set the blade turn time for Venetian mode. Details can be found in section 4.2 of Advanced information Product Manual.</Help>
@@ -67,9 +72,9 @@ Product Type ID: EU=0x00, US=0x01, AU=0x02 CN=0x1D
     </Value>
     <Value genre="config" index="36" label="Enter/exit calibration mode" size="1" type="list" units="" value="0" write_only="true"> 
       <Help>Set to enter/exit calibration mode</Help>
-      <Item label="Set: Exit calibration mode/Report: Not in calibration mode" value="0" />
-      <Item label="Set: Enter shutter mode calibration/Report: in shutter mode calibration" value="1" />
-      <Item label="Set: Enter Venetian mode calibration/Report: in Venetian mode calibration" value="2" />
+      <Item label="Exit calibration mode/Report: Not in calibration mode" value="0" />
+      <Item label="Enter shutter mode calibration/Report: in shutter mode calibration" value="1" />
+      <Item label="Enter Venetian mode calibration/Report: in Venetian mode calibration" value="2" />
     </Value>
     <Value genre="config" index="37" label="User confirmation for calibration" size="1" type="list" units="" value="0" write_only="true">
       <Help>Set user confirmation for calibration</Help>

diff --git a/config/aeotec/zwa011.xml b/config/aeotec/zwa011.xml
@@ -0,0 +1,157 @@
+<!-- ZWA008 Door Window Sensor 7 -->
+<Product Revision="1" xmlns="https://github.com/OpenZWave/open-zwave">
+  <MetaData>
+    <MetaDataItem name="OzwInfoPage">http://www.openzwave.com/device-database/0371:000B:0002</MetaDataItem>
+    <MetaDataItem name="ProductPic">images/aeotec/zwa011.png</MetaDataItem>
+    <MetaDataItem id="000B" name="ZWProductPage" type="0002">https://products.z-wavealliance.org/products/3866/</MetaDataItem>
+    <MetaDataItem name="Name">Door / Window Sensor 7</MetaDataItem>
+    <MetaDataItem id="000B" name="FrequencyName" type="0002">CEPT (Europe)</MetaDataItem>
+    <MetaDataItem id="000B" name="Identifier" type="0002">ZWA011-C</MetaDataItem>
+    <MetaDataItem name="Description">Aeotec Door/ Window Sensor 7 is built on the 700 series Z-Wave technology. 
+      Its a small window position sensor for your smart home, it monitors window and their exact opening position and lets your know when a window is tilted or completely opened. 
+      It also supports connecting external binary sensors with a dry contact through the dry binary contact of the Door/ Window sensor. 
+      Using the latest technology it supports the highest Z-Wave security level of S2 and SmartStart. 
+    </MetaDataItem>
+    <MetaDataItem name="WakeupDescription">Press the tamper once</MetaDataItem>
+    <MetaDataItem name="InclusionDescription">1. Open the housing.
+      2. Remove the battery protection.
+      3. Press the tamper on the side of the appliance three times quickly.
+    </MetaDataItem>
+    <MetaDataItem name="ExclusionDescription">1. Open the housing.
+      2. Press the tamper on the side of the appliance three times quickly.
+    </MetaDataItem>
+    <MetaDataItem name="ResetDescription">Reset to factory default
+      This device also allows to be reset without any involvement of a Z-Wave controller. This procedure should only be used when the primary controller is inoperable.
+      Once Cover is removed and the tamper switch is tripped, push the tamper for 5 seconds until the RED LED
+      blinks once. Then release tamper and push it again for 5 seconds while the RED LED is blinking until the
+      GREEN LED blinks once.
+    </MetaDataItem>
+    <MetaDataItem name="ProductManual">https://aeotec.freshdesk.com/support/solutions/folders/6000237099</MetaDataItem>
+    <MetaDataItem name="ProductSupport">https://aeotec.freshdesk.com/support/solutions/folders/6000237099</MetaDataItem>
+    <ChangeLog>
+      <Entry author="Justin Hammond" date="06 July 2020" revision="1">Initial Config File taken from ZWA012</Entry>
+      <Entry author="GizMoCuz" date="13 April 2021" revision="1">Initial Config File taken from https://help.aeotec.com/support/solutions/articles/6000218764-door-windows-sensor-7-user-guide</Entry>
+    </ChangeLog>
+  </MetaData>
+  <!-- Basic set as report -->
+  <CommandClass id="32">
+    <Compatibility>
+      <SetAsReport>true</SetAsReport>
+    </Compatibility>
+  </CommandClass>
+  <!-- Configuration Parameters -->
+  <CommandClass id="112">
+    <Value genre="config" index="1" instance="1" label="Operation mode" max="1" min="0" size="1" type="list" value="0">
+      <Help>Parameter defines device operation mode.</Help>
+      <Item label="Built-in hall sensor" value="0"/>
+      <Item label="External Input" value="1"/>
+    </Value>
+    <Value genre="config" index="2" instance="1" label="Door/Window or alarm status" max="1" min="0" size="1" type="list" value="0">
+      <Help>
+                Parameter defines state of the sensor when the magnet is close.
+                If the alarm sensor is connected, it determines the output type.
+                Parameter inactive in external button mode (parameter Operation Mode set to 1).
+            </Help>
+      <Item label="Closed" value="0"/>
+      <Item label="Opened" value="1"/>
+    </Value>
+    <Value genre="config" index="3" instance="1" label="Visual LED indications" max="7" min="0" size="1" type="byte" value="7">
+      <Help>
+                This parameter defines events indicated by the visual LED indicator. Disabling events might extend battery life.
+                Values of parameters may be combined, e.g. 1+2=3 means opening/closing and wake up will be indicated by the visual indicator.
+                0 - No indications.
+                1 - Indication of opening/closing status change (input In).
+                2 - Indication of wake up (1 x click or periodical).
+                4 - Indication of device tampering.
+            </Help>
+    </Value>
+    <Value genre="config" index="4" instance="1" label="Range test after double click" max="1" min="0" size="1" type="list" value="0">
+      <Help>
+                Allows to enable activation of Z-Wave range test with double click of a Tamper Switch 2.
+            </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value genre="config" index="5" instance="1" label="2nd Association Group triggers" max="1" min="0" size="1" type="list" value="0">
+      <Help>
+                Parameter defines events which result in sending On/Off commands to devices added to the 2nd Association Group.
+                These commands are sent alternately to switch the devices On and Off.
+                Commands represent the values of BASIC SET command frames.
+                Parameter is inactive in external dry-contact mode (parameter Operation Mode set to 1).
+            </Help>
+      <Item label="Switch after opening and closing" value="0"/>
+      <Item label="Switch after opening" value="1"/>
+      <Item label="Switch after closing" value="2"/>
+    </Value>
+    <Value genre="config" index="6" instance="1" label="Commands sent to 2nd Association Group" max="1" min="0" size="1" type="list" value="2">
+      <Help>
+                Command frames sent to devices added to the 2nd association group.
+            </Help>
+      <Item label="On" value="0"/>
+      <Item label="Off" value="1"/>
+      <Item label="On and Off" value="2"/>
+    </Value>
+    <Value genre="config" index="7" instance="1" label="Value of ON command frame sent to 2nd Association Group" max="255" min="0" size="1" type="byte" value="255">
+      <Help>
+                The value of 0 turns OFF the device, 255 turns it On.
+                In case of associating the Dimmer or Roller Shutter module, values 1-99 allow to set an Associated device to a specified level.
+            </Help>
+    </Value>
+    <Value genre="config" index="8" instance="1" label="Value of OFF command frame sent to 2nd Association Group" max="255" min="0" size="1" type="byte" value="0">
+      <Help>
+                The value of 0 turns OFF the device, 255 turns it On.
+                In case of associating the Dimmer or Roller Shutter module, values 1-99 allow to set an Associated device to a specified level.
+            </Help>
+    </Value>
+    <Value genre="config" index="9" instance="1" label="Time delay of ON command frame" max="32400" min="0" size="2" type="short" units="seconds" value="0">
+      <Help>
+                Time period after which On command frame will be sent.
+            </Help>
+    </Value>
+    <Value genre="config" index="10" instance="1" label="Time delay of OFF command frame" max="32400" min="0" size="2" type="short" units="seconds" value="0">
+      <Help>
+                Time period after which Off command frame will be sent.
+            </Help>
+    </Value>
+    <Value genre="config" index="11" instance="1" label="Delay of tamper alarm cancellation" max="32400" min="0" size="2" type="short" units="seconds" value="5">
+      <Help>
+                Time period after which a tamper alarm will be cancelled.
+            </Help>
+    </Value>
+    <Value genre="config" index="12" instance="1" label="Reporting tamper alarm cancellation" max="1" min="0" size="1" type="list" value="1">
+      <Help>
+                Reporting cancellation of tamper alarm to the controller and 5th Association Group.
+            </Help>
+      <Item label="Do not send tamper cancellation report" value="0"/>
+      <Item label="Send tamper cancellation report" value="1"/>
+    </Value>
+    <Value genre="config" index="13" instance="1" label="Scene activation functionality" max="1" min="0" size="1" type="list" value="0">
+      <Help>
+                The device can trigger scenes via Dry Input Terminal (external contact) using scene IDs assigned to different events.
+            </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value genre="config" index="14" instance="1" label="Tilt Sensor functionality" max="1" min="0" size="1" type="list" value="1">
+      <Help>
+                The device can report Tilt Window events.
+                This functionality can be disabled if the device is mounted on a door or windows without tilt functionality.To disable tilt detection set the value to 0.
+            </Help>
+      <Item label="Disable" value="0"/>
+      <Item label="Enable" value="1"/>
+    </Value>
+    <Value genre="config" index="15" instance="1" label="Tilt sensitivity" max="100" min="0" size="1" type="byte" units="" value="50">
+      <Help>You can use this parameter to adjust the tilt sensitivity if the tilt is too low or too high.
+      </Help>
+    </Value>
+  </CommandClass>
+  <!-- Association Groups -->
+  <CommandClass id="133">
+    <Associations num_groups="4">
+      <Group index="1" label="Lifeline" max_associations="5"/>
+      <Group index="2" label="Control" max_associations="5"/>
+      <Group index="3" label="Alarm sensor" max_associations="5"/>
+      <Group index="4" label="Alarm tamper" max_associations="5"/>
+    </Associations>
+  </CommandClass>
+</Product>