Database update (openhab#1048)

Signed-off-by: Chris Jackson <[email protected]>

Author: cdjackson

ESH-INF/thing/aeotec/zwa005_0_0.xml

@@ -6,20 +6,14 @@
                       http://eclipse.org/smarthome/schemas/thing-description/v1.0.0">
 
   <thing-type id="aeotec_zwa005_00_000" listed="false">
-    <label>ZWA005 TriSensor</label>
+    <label>ZWA005 Motion, light, and temperature sensor</label>
     <description><![CDATA[
-TriSensor<br /><h1>Overview</h1><p>Aeotec TriSensor is a universal Z-Wave Plus compatible product, consists of temperature, lighting and motion sensors, powered by a CR123A battery. It can be included and operated in any Z-Wave network with other Z-Wave certified devices from other manufacturers and/or other applications. By the built-in motion sensor, an alarm will be sent to the gateway when the motion sensor is triggered.</p> <br /><h2>Inclusion Information</h2><p>Press once TriSensor’s Action Button. If it is the first installation, the yellow LED will keep solid until whole network processing is complete. If successful, the LED will flash white -&gt; green -&gt; white -&gt; green, after 2 seconds finished. If failed, the yellow LED lasts for 30 seconds, then the green LED flashes once. If it is the S2 encryption network, please enter the first 5 digits of DSK.</p> <br /><h2>Exclusion Information</h2><p>Press once TriSensor’s Action Button, the Purple LED will keep solid until whole network processing is complete. If the exclusion is successful, the LED will flash white -&gt; green - &gt;white -&gt; green and then LED will pulse a blue. If failed, the yellow LED lasts for 30 seconds, then the green LED flashes once.</p> <br /><h2>Wakeup Information</h2><p>Press and hold the button at least 2s until Red Led is on and then release the button,device will send wakeup notification to controller if device is in a Z-Wave network.</p>
+Motion, light, and temperature sensor<br /><h1>Overview</h1><p>Aeotec TriSensor is a universal Z-Wave Plus compatible product, consists of temperature, lighting and motion sensors, powered by a CR123A battery. It can be included and operated in any Z-Wave network with other Z-Wave certified devices from other manufacturers and/or other applications. By the built-in motion sensor, an alarm will be sent to the gateway when the motion sensor is triggered.</p> <br /><h2>Inclusion Information</h2><p>Press once TriSensor’s Action Button. If it is the first installation, the yellow LED will keep solid until whole network processing is complete. If successful, the LED will flash white -&gt; green -&gt; white -&gt; green, after 2 seconds finished. If failed, the yellow LED lasts for 30 seconds, then the green LED flashes once. If it is the S2 encryption network, please enter the first 5 digits of DSK.</p> <br /><h2>Exclusion Information</h2><p>Press once TriSensor’s Action Button, the Purple LED will keep solid until whole network processing is complete. If the exclusion is successful, the LED will flash white -&gt; green - &gt;white -&gt; green and then LED will pulse a blue. If failed, the yellow LED lasts for 30 seconds, then the green LED flashes once.</p> <br /><h2>Wakeup Information</h2><p>Press and hold the button at least 2s until Red Led is on and then release the button,device will send wakeup notification to controller if device is in a Z-Wave network.</p>
     ]]></description>
     <category>Sensor</category>
 
     <!-- CHANNEL DEFINITIONS -->
     <channels>
-      <channel id="sensor_binary" typeId="sensor_binary">
-        <label>Binary Sensor</label>
-        <properties>
-          <property name="binding:*:OnOffType">COMMAND_CLASS_SENSOR_BINARY</property>
-        </properties>
-      </channel>
       <channel id="sensor_temperature" typeId="sensor_temperature">
         <label>Sensor (temperature)</label>
         <properties>
@@ -32,8 +26,8 @@ TriSensor<br /><h1>Overview</h1><p>Aeotec TriSensor is a universal Z-Wave Plus c
           <property name="binding:*:DecimalType">COMMAND_CLASS_SENSOR_MULTILEVEL;type=LUMINANCE</property>
         </properties>
       </channel>
-      <channel id="alarm_burglar" typeId="alarm_burglar">
-        <label>Alarm (burglar)</label>
+      <channel id="alarm_motion" typeId="alarm_motion">
+        <label>Motion Alarm</label>
         <properties>
           <property name="binding:*:OnOffType">COMMAND_CLASS_ALARM;type=BURGLAR</property>
         </properties>
@@ -52,6 +46,7 @@ TriSensor<br /><h1>Overview</h1><p>Aeotec TriSensor is a universal Z-Wave Plus c
       <property name="manufacturerId">0371</property>
       <property name="manufacturerRef">0102:0005,0202:0005</property>
       <property name="dbReference">921</property>
+      <property name="defaultAssociations">1</property>
     </properties>
 
     <!-- CONFIGURATION DESCRIPTIONS -->
@@ -311,15 +306,15 @@ Calibration coefficient for light measurements<br /><h1>Overview</h1><p>This con
       </parameter>
 
       <parameter name="group_2" type="text" groupName="association" multiple="true">
-        <label>2: Controlling Group</label>
+        <label>2: Motion Alarm</label>
         <description><![CDATA[
 <br /><h1>Overview</h1><p>Group 2 is controlling group, all nodes associated in this group will be controlled through BASIC_SET command by the device when device detects a movement event. Basic Set Value is decided by Configuration Parameter 6.</p>
         ]]></description>
         <multipleLimit>5</multipleLimit>
       </parameter>
 
       <parameter name="group_3" type="text" groupName="association" multiple="true">
-        <label>3: Controlling Group</label>
+        <label>3: Temperature Alarm</label>
         <description><![CDATA[
 <br /><h1>Overview</h1><p>Group 3 is controlling group, all nodes associated in this group will be controlled through BASIC_SET command by the device when device detects a movement event. Basic Set Value is decided by Configuration Parameter 6.</p>
         ]]></description>

ESH-INF/thing/tkb/tz74_0_0.xml

@@ -8,7 +8,7 @@
   <thing-type id="tkb_tz74_00_000" listed="false">
     <label>TZ74 Insert two channel switch module</label>
     <description><![CDATA[
-Insert two channel switch module<br /><h2>Inclusion Information</h2><p>Have Z-Wave Controller entered inclusion mode. Pressing On/Off button three times within 1.5 seconds will enter inclusion mode.</p> <br /><h2>Exclusion Information</h2><p>Have Z-Zwave controller entered exclusion mode. Pressing On/Off button three times within 1.5 seconds will enter exclusion mode.</p>
+Insert two channel switch module<br /><h2>Inclusion Information</h2><p>Have Z-Wave Controller entered inclusion mode. Pressing On/Off button three times within 1.5 seconds will enter inclusion mode.</p> <br /><h2>Exclusion Information</h2><p>Have Z-Wave controller entered exclusion mode. Pressing On/Off button three times within 1.5 seconds will enter exclusion mode.</p>
     ]]></description>
     <category>WallSwitch</category>
 

ESH-INF/thing/vision/zs5101_0_0.xml

@@ -10,6 +10,7 @@
     <description><![CDATA[
 Shock Sensor<br /><h1>Overview</h1><p>ZS5101 detects the vibrations made by an intruder trying to break a window or door, and also detect tamper situations, it will send Z-Wave signal when vibrations or tamper situations are detected. </p> <br /><h2>Inclusion Information</h2><p>For "Inclusion" in (adding to) a network: Put the Z-Wave Interface Controller into "inclusion" mode, and following its instruction to add the ZS5101 to your controller.  To get in the "inclusion" mode, the distance between sensor and controller is suggested to be in one meter.  Press the program/tamper switch of ZS5101 for 1 second at least to be included. The LED on the ZS5101 should go off, if not, please try again</p> <br /><h2>Exclusion Information</h2><p>For "Exclusion" from (removing from) a network: Put the Z-Wave Interface Controller into "exclusion" mode, and following its instruction to delete the ZS5101 from your controller.  Press the program/tamper switch of ZS5101 for 1 second at least to be excluded.  </p> <br /><h2>Wakeup Information</h2><p>"Awake" mode: it is to leave the "Sleep" mode by removing the cover of ZS5101, to allow the Z-Wave Interface Controller to do "Inclusion", "Exclusion", "Association" and to reply and receive the commands from controller. </p>
     ]]></description>
+    <category>Sensor</category>
 
     <!-- CHANNEL DEFINITIONS -->
     <channels>

doc/aeotec/zwa005_0_0.md

@@ -5,7 +5,7 @@ title: ZWA005 - ZWave
 
 {% include base.html %}
 
-# ZWA005 TriSensor
+# ZWA005 Motion, light, and temperature sensor
 This describes the Z-Wave device *ZWA005*, manufactured by *Aeotec Limited* with the thing type UID of ```aeotec_zwa005_00_000```.
 
 The device is in the category of *Sensor*, defining Device used to measure something.
@@ -53,25 +53,11 @@ The following table summarises the channels available for the ZWA005 -:
 
 | Channel | Channel Id | Category | Item Type |
 |---------|------------|----------|-----------|
-| Binary Sensor | sensor_binary | Door | Switch | 
 | Sensor (temperature) | sensor_temperature | Temperature | Number:Temperature | 
 | Sensor (luminance) | sensor_luminance |  | Number | 
-| Alarm (burglar) | alarm_burglar | Door | Switch | 
+| Motion Alarm | alarm_motion | Door | Switch | 
 | Battery Level | battery-level | Battery | Number |
 
-### Binary Sensor
-
-Indicates if a sensor has triggered.
-
-The ```sensor_binary``` channel supports the ```Switch``` item and is in the ```Door``` category. This is a read only channel so will only be updated following state changes from the device.
-
-The following state translation is provided for this channel to the ```Switch``` item type -:
-
-| Value | Label     |
-|-------|-----------|
-| ON | Triggered |
-| OFF | Untriggered |
-
 ### Sensor (temperature)
 
 Indicates the current temperature.
@@ -84,11 +70,11 @@ Indicates the current light reading.
 
 The ```sensor_luminance``` channel supports the ```Number``` item. This is a read only channel so will only be updated following state changes from the device.
 
-### Alarm (burglar)
+### Motion Alarm
 
-Indicates if the burglar alarm is triggered.
+Indicates if a motion alarm is triggered.
 
-The ```alarm_burglar``` channel supports the ```Switch``` item and is in the ```Door``` category. This is a read only channel so will only be updated following state changes from the device.
+The ```alarm_motion``` channel supports the ```Switch``` item and is in the ```Door``` category. This is a read only channel so will only be updated following state changes from the device.
 
 The following state translation is provided for this channel to the ```Switch``` item type -:
 
@@ -480,13 +466,13 @@ The Lifeline association group reports device status to a hub and is not designe
 
 Association group 1 supports 5 nodes.
 
-### Group 2: Controlling Group
+### Group 2: Motion Alarm
 
 Group 2 is controlling group, all nodes associated in this group will be controlled through BASIC_SET command by the device when device detects a movement event. Basic Set Value is decided by Configuration Parameter 6.
 
 Association group 2 supports 5 nodes.
 
-### Group 3: Controlling Group
+### Group 3: Temperature Alarm
 
 Group 3 is controlling group, all nodes associated in this group will be controlled through BASIC_SET command by the device when device detects a movement event. Basic Set Value is decided by Configuration Parameter 6.
 
@@ -521,6 +507,7 @@ Association group 3 supports 5 nodes.
 ### Documentation Links
 
 * [Manual](https://www.cd-jackson.com/zwave_device_uploads/921/Aeotec-Trisensor-Engineering-Specification.pdf)
+* [User manual](https://www.cd-jackson.com/zwave_device_uploads/921/TriSensor-user-manual-20180416.pdf)
 
 ---
 

doc/tkb/tz74_0_0.md

@@ -23,7 +23,7 @@ Have Z-Wave Controller entered inclusion mode. Pressing On/Off button three time
 
 ### Exclusion Information
 
-Have Z-Zwave controller entered exclusion mode. Pressing On/Off button three times within 1.5 seconds will enter exclusion mode.
+Have Z-Wave controller entered exclusion mode. Pressing On/Off button three times within 1.5 seconds will enter exclusion mode.
 
 ## Channels
 

doc/vision/zs5101_0_0.md

@@ -8,6 +8,8 @@ title: ZS5101 - ZWave
 # ZS5101 Shock Sensor
 This describes the Z-Wave device *ZS5101*, manufactured by *[Vision Security](http://www.visionsecurity.com.tw/)* with the thing type UID of ```vision_zs5101_00_000```.
 
+The device is in the category of *Sensor*, defining Device used to measure something.
+
 ![ZS5101 product image](https://www.cd-jackson.com/zwave_device_uploads/442/442_default.jpg)