Merge branch 'master' into transactions

* master: Minor updates and additions to README (openhab#32) Add reference to database files (openhab#30) Fix bug setting parameter to write_only (openhab#31) Database update (openhab#29) Database update (openhab#28) Fix NPE if requesting non-existing association group (openhab#27) Signed-off-by: Chris Jackson <chris@cd-jackson.com> # Conflicts: # src/main/java/org/openhab/binding/zwave/internal/protocol/commandclass/ZWaveConfigurationCommandClass.java # src/main/java/org/openhab/binding/zwave/internal/protocol/commandclass/ZWaveNoOperationCommandClass.java # src/test/java/org/openhab/binding/zwave/test/internal/protocol/commandclass/ZWaveConfigurationCommandClassTest.java
cdjackson · Aug 17, 2016 · 1022f76 · 1022f76
2 parents f335427 + 479b985
commit 1022f76
Show file tree

Hide file tree

Showing 307 changed files with 1,134 additions and 70 deletions.
diff --git a/ESH-INF/thing/act_45602_0_0.xml b/ESH-INF/thing/act_45602_0_0.xml
@@ -26,6 +26,7 @@
       <property name="modelId">45602</property>
       <property name="manufacturerId">0001</property>
       <property name="manufacturerRef">4450:3030</property>
+      <property name="dbReference">338</property>
     </properties>
 
     <!-- CONFIGURATION DESCRIPTIONS -->

diff --git a/ESH-INF/thing/act_zdp200_0_0.xml b/ESH-INF/thing/act_zdp200_0_0.xml
@@ -28,6 +28,7 @@ HomePro ZDP200 Wall Dimmer<br /><h2>Inclusion Information</h2><p>Use the button
       <property name="modelId">ZDP200</property>
       <property name="manufacturerId">0001</property>
       <property name="manufacturerRef">4450:3030</property>
+      <property name="dbReference">385</property>
       <property name="defaultAssociations">1</property>
     </properties>
 

diff --git a/ESH-INF/thing/act_zrp200_0_0.xml b/ESH-INF/thing/act_zrp200_0_0.xml
@@ -27,6 +27,7 @@ HomePro Applicance Module ZRP200<br /><h1>Overview</h1><p>This is a very old app
       <property name="modelId">ZRP200</property>
       <property name="manufacturerId">0001</property>
       <property name="manufacturerRef">7FFF:7FFF</property>
+      <property name="dbReference">360</property>
     </properties>
 
   </thing-type>

diff --git a/ESH-INF/thing/aeon_aeonzw120_0_0.xml b/ESH-INF/thing/aeon_aeonzw120_0_0.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<thing:thing-descriptions bindingId="zwave"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:thing="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0"
+  xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0
+                      http://eclipse.org/smarthome/schemas/thing-description/v1.0.0">
+
+  <thing-type id="aeon_aeonzw120_00_000" listed="false">
+    <label>ZW120 Door/Window sensor Gen5</label>
+    <description>Door/Window sensor Gen5</description>
+
+    <!-- CHANNEL DEFINITIONS -->
+    <channels>
+      <channel id="sensor_binary" typeId="sensor_binary">
+        <label>Binary Sensor</label>
+        <properties>
+          <property name="binding:*:OnOffType">SENSOR_BINARY,BASIC</property>
+        </properties>
+      </channel>
+      <channel id="alarm_general" typeId="alarm_general">
+        <label>Alarm (general)</label>
+        <properties>
+          <property name="binding:*:OnOffType">ALARM;type=GENERAL</property>
+        </properties>
+      </channel>
+      <channel id="battery-level" typeId="system.battery-level">
+        <properties>
+          <property name="binding:*:PercentType">BATTERY</property>
+        </properties>
+      </channel>
+    </channels>
+
+    <!-- DEVICE PROPERTY DEFINITIONS -->
+    <properties>
+      <property name="vendor">Aeon Labs</property>
+      <property name="modelId">ZW120</property>
+      <property name="manufacturerId">0086</property>
+      <property name="manufacturerRef">0102:0078</property>
+      <property name="dbReference">405</property>
+      <property name="defaultAssociations">1</property>
+    </properties>
+
+    <!-- CONFIGURATION DESCRIPTIONS -->
+    <config-description>
+
+      <!-- PARAMETER DEFINITIONS -->
+      <parameter-group name="configuration">
+        <context>setup</context>
+        <label>Configuration Parameters</label>
+      </parameter-group>
+
+      <parameter name="config_1_1" type="integer" groupName="configuration">
+        <label>1: Which value of the Sensor Binary Report or Basic Set will be sent when the Magnet is triggered On/Off.</label>
+        <default>0</default>
+        <options>
+          <option value="0">On=Sensor Binary Report/Basic Set 0xFF; Off=Sensor Binary Report/Basic</option>
+          <option value="1">On=Sensor Binary Report/Basic Set 0x00; Off=Sensor Binary Report/Basic</option>
+        </options>
+      </parameter>
+
+      <parameter name="config_2_1" type="integer" groupName="configuration">
+        <label>2: Enable wake up 10 minutes when re-power on the sensor</label>
+        <description>Default setting: Disable</description>
+        <default>1</default>
+        <options>
+          <option value="0">Disable</option>
+          <option value="1">Enable</option>
+        </options>
+      </parameter>
+
+      <parameter name="config_3_1" type="integer" groupName="configuration">
+        <label>3: Basic Set Report</label>
+        <description>Which value of the Basic Set will be sent when the door is Opened/Closed</description>
+        <default>0</default>
+        <options>
+          <option value="0">Open: 0xFF, Close: 0x00</option>
+          <option value="1">Open: 0x00, Close: 0xFF</option>
+        </options>
+      </parameter>
+
+      <parameter name="config_39_1" type="integer" groupName="configuration"
+                 min="10" max="50">
+        <label>39: Set the low battery value.</label>
+        <description>10% to 50%</description>
+        <default>10</default>
+      </parameter>
+
+      <parameter name="config_111_4" type="integer" groupName="configuration"
+                 min="0" max="2147483647">
+        <label>111: Set the interval time of low battery checking.</label>
+        <description>Minimum interval is 4 minutes, Range is 0 to 2147483647</description>
+        <default>86640</default>
+      </parameter>
+
+      <parameter name="config_121_4" type="integer" groupName="configuration"
+                 min="0" max="65535">
+        <label>121: Report type</label>
+        <description>To configure which sensor report will be sent when the Sensor is triggered Opened/Closed. Bitsets: 0-&gt;Battery report, 4-&gt;Sensor Binary, 8-&gt;Basic Set, Default setting: 0x00000100 (Basic Set).Ideal Setting for OZW is 17 (Sensor Binary and Battery Report).</description>
+        <default>1</default>
+      </parameter>
+
+      <parameter name="config_255_4" type="integer" groupName="configuration">
+        <label>255: Reset To Factory Defaults.</label>
+        <default>0</default>
+        <options>
+          <option value="0">Reset to factory default setting</option>
+          <option value="1">Normal</option>
+          <option value="1431655765">Reset to factory default</option>
+        </options>
+      </parameter>
+
+      <!-- ASSOCIATION DEFINITIONS -->
+      <parameter-group name="association">
+        <context>link</context>
+        <label>Association Groups</label>
+      </parameter-group>
+
+      <parameter name="group_1" type="text" groupName="association" multiple="true">
+        <label>1: Group 1</label>
+        <multipleLimit>5</multipleLimit>
+      </parameter>
+
+    </config-description>
+
+  </thing-type>
+</thing:thing-descriptions>
diff --git a/ESH-INF/thing/aeon_dsa03202_0_0.xml b/ESH-INF/thing/aeon_dsa03202_0_0.xml
@@ -25,6 +25,7 @@
       <property name="modelId">DSA03202</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0001:0003,0006:0002</property>
+      <property name="dbReference">74</property>
       <property name="commandClass:WAKE_UP">getSupported=false</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_dsb05_0_0.xml b/ESH-INF/thing/aeon_dsb05_0_0.xml
@@ -48,6 +48,7 @@
       <property name="modelId">DSB05</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0002:0005</property>
+      <property name="dbReference">71</property>
       <property name="commandClass:SENSOR_MULTILEVEL">getSupported=false</property>
       <property name="defaultAssociations">1</property>
     </properties>

diff --git a/ESH-INF/thing/aeon_dsb09_0_0.xml b/ESH-INF/thing/aeon_dsb09_0_0.xml
@@ -96,6 +96,7 @@
       <property name="modelId">DSB09</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0002:0009</property>
+      <property name="dbReference">84</property>
       <property name="defaultAssociations">1</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_dsb28_0_0.xml b/ESH-INF/thing/aeon_dsb28_0_0.xml
@@ -121,6 +121,7 @@
       <property name="modelId">DSB28</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0002:001C</property>
+      <property name="dbReference">85</property>
     </properties>
 
     <!-- CONFIGURATION DESCRIPTIONS -->

diff --git a/ESH-INF/thing/aeon_dsb29_0_0.xml b/ESH-INF/thing/aeon_dsb29_0_0.xml
@@ -36,6 +36,7 @@
       <property name="modelId">DSB29</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0002:0004,0002:001D</property>
+      <property name="dbReference">70</property>
       <property name="defaultAssociations">1</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_dsb45_0_0.xml b/ESH-INF/thing/aeon_dsb45_0_0.xml
@@ -38,6 +38,7 @@ Water Sensor<br /><h2>Wakeup Information</h2><p>Press WakeUp button or hold z-wa
       <property name="modelId">DSB45</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0002:002D</property>
+      <property name="dbReference">92</property>
       <property name="defaultAssociations">1</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_dsb54_0_0.xml b/ESH-INF/thing/aeon_dsb54_0_0.xml
@@ -30,6 +30,7 @@
       <property name="modelId">DSB54</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0002:0036</property>
+      <property name="dbReference">68</property>
       <property name="defaultAssociations">1,2</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_dsc06_0_0.xml b/ESH-INF/thing/aeon_dsc06_0_0.xml
@@ -43,6 +43,7 @@
       <property name="modelId">DSC06</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0003:0006</property>
+      <property name="dbReference">75</property>
       <property name="defaultAssociations">1</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_dsc08_0_0.xml b/ESH-INF/thing/aeon_dsc08_0_0.xml
@@ -44,6 +44,7 @@
       <property name="modelId">DSC08</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0003:0008</property>
+      <property name="dbReference">77</property>
     </properties>
 
     <!-- CONFIGURATION DESCRIPTIONS -->

diff --git a/ESH-INF/thing/aeon_dsc11_0_0.xml b/ESH-INF/thing/aeon_dsc11_0_0.xml
@@ -111,6 +111,7 @@ Smart Strip<br /><h1>Overview</h1><p>Update command classes -:<br />METER:5 :: A
       <property name="modelId">DSC11</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0003:000B</property>
+      <property name="dbReference">89</property>
       <property name="defaultAssociations">1</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_dsc12_0_0.xml b/ESH-INF/thing/aeon_dsc12_0_0.xml
@@ -43,6 +43,7 @@
       <property name="modelId">DSC12</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0003:000C</property>
+      <property name="dbReference">277</property>
       <property name="defaultAssociations">1,2</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_dsc14_0_0.xml b/ESH-INF/thing/aeon_dsc14_0_0.xml
@@ -19,6 +19,7 @@
       <property name="modelId">DSC14</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0003:000E</property>
+      <property name="dbReference">289</property>
       <property name="defaultAssociations">1</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_dsc17_0_0.xml b/ESH-INF/thing/aeon_dsc17_0_0.xml
@@ -55,6 +55,7 @@
       <property name="modelId">DSC17</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0003:0011</property>
+      <property name="dbReference">81</property>
       <property name="defaultAssociations">1</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_dsc18_0_0.xml b/ESH-INF/thing/aeon_dsc18_0_0.xml
@@ -55,6 +55,7 @@
       <property name="modelId">DSC18</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0003:0012</property>
+      <property name="dbReference">278</property>
       <property name="defaultAssociations">1,2</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_dsc19_0_0.xml b/ESH-INF/thing/aeon_dsc19_0_0.xml
@@ -50,6 +50,7 @@
       <property name="modelId">DSC19</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0003:0013</property>
+      <property name="dbReference">79</property>
       <property name="defaultAssociations">1,2</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_dsc24_0_0.xml b/ESH-INF/thing/aeon_dsc24_0_0.xml
@@ -14,7 +14,7 @@
       <channel id="switch_binary" typeId="switch_binary">
         <label>Switch</label>
         <properties>
-          <property name="binding:*:OnOffType">SWITCH_BINARY</property>
+          <property name="binding:*:OnOffType">SWITCH_BINARY,BASIC</property>
         </properties>
       </channel>
       <channel id="scene_number" typeId="scene_number">
@@ -54,7 +54,8 @@
       <property name="vendor">Aeon Labs</property>
       <property name="modelId">DSC24</property>
       <property name="manufacturerId">0086</property>
-      <property name="manufacturerRef">0003:0018</property>
+      <property name="manufacturerRef">0003:0018,0103:004B</property>
+      <property name="dbReference">76</property>
       <property name="defaultAssociations">1</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_dsc25_0_0.xml b/ESH-INF/thing/aeon_dsc25_0_0.xml
@@ -26,6 +26,7 @@
       <property name="modelId">DSC25</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0003:0019</property>
+      <property name="dbReference">276</property>
     </properties>
 
   </thing-type>

diff --git a/ESH-INF/thing/aeon_dsc26_0_0.xml b/ESH-INF/thing/aeon_dsc26_0_0.xml
@@ -25,6 +25,7 @@
       <property name="modelId">DSC26</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0003:001A</property>
+      <property name="dbReference">82</property>
       <property name="defaultAssociations">1</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_dsc27_0_0.xml b/ESH-INF/thing/aeon_dsc27_0_0.xml
@@ -26,6 +26,7 @@
       <property name="modelId">DSC27</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0003:001B</property>
+      <property name="dbReference">80</property>
       <property name="defaultAssociations">1</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_dsd31_0_0.xml b/ESH-INF/thing/aeon_dsd31_0_0.xml
@@ -25,6 +25,7 @@
       <property name="modelId">DSD31</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0004:0050</property>
+      <property name="dbReference">86</property>
       <property name="defaultAssociations">1</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_dsd37_0_0.xml b/ESH-INF/thing/aeon_dsd37_0_0.xml
@@ -19,6 +19,7 @@
       <property name="modelId">DSD37</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0004:0025,0019:0004</property>
+      <property name="dbReference">66</property>
     </properties>
 
     <!-- CONFIGURATION DESCRIPTIONS -->

diff --git a/ESH-INF/thing/aeon_zw056_0_0.xml b/ESH-INF/thing/aeon_zw056_0_0.xml
@@ -27,6 +27,7 @@ Doorbell<br /><h1>Overview</h1><p>Aeon Labs Doorbell is a switch binary device b
       <property name="modelId">ZW056</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0004:0038,0104:0038,0204:0038,0304:0038,0904:0038,0A04:0038,1A04:0038,1D04:0038</property>
+      <property name="dbReference">263</property>
       <property name="defaultAssociations">1</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_zw062_0_0.xml b/ESH-INF/thing/aeon_zw062_0_0.xml
@@ -33,6 +33,7 @@ Aeon Labs Garage Door Controller Gen5 <br /><h1>Overview</h1><p>Aeon Labs Garage
       <property name="modelId">ZW062</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0003:003E,0103:003E</property>
+      <property name="dbReference">256</property>
       <property name="defaultAssociations">1</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_zw074_0_0.xml b/ESH-INF/thing/aeon_zw074_0_0.xml
@@ -54,6 +54,7 @@
       <property name="modelId">ZW074</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0002:004A,0102:004A,0202:004A</property>
+      <property name="dbReference">72</property>
       <property name="defaultAssociations">1</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_zw075_0_0.xml b/ESH-INF/thing/aeon_zw075_0_0.xml
@@ -60,6 +60,7 @@
       <property name="modelId">ZW075</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0003:004B,0203:004B</property>
+      <property name="dbReference">83</property>
     </properties>
 
     <!-- CONFIGURATION DESCRIPTIONS -->

diff --git a/ESH-INF/thing/aeon_zw080_0_0.xml b/ESH-INF/thing/aeon_zw080_0_0.xml
@@ -27,6 +27,7 @@ Siren Gen5<br /><h1>Overview</h1><p>Update command classes -:<br />METER:5 :: AD
       <property name="modelId">ZW080</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0004:0050,0104:0050,0204:0050</property>
+      <property name="dbReference">90</property>
       <property name="defaultAssociations">1</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_zw088_1_0.xml b/ESH-INF/thing/aeon_zw088_1_0.xml
@@ -33,6 +33,7 @@
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0001:0058,0101:0058,0201:0058</property>
       <property name="versionMin">1.0</property>
+      <property name="dbReference">87</property>
       <property name="commandClass:SCENE_ACTIVATION">ccAdd</property>
       <property name="defaultAssociations">1,2,3,4</property>
     </properties>

diff --git a/ESH-INF/thing/aeon_zw089_0_0.xml b/ESH-INF/thing/aeon_zw089_0_0.xml
@@ -38,6 +38,7 @@ Recessed Door Sensor Gen5<br /><h1>Overview</h1><p>Aeon Labs Recessed Door Senso
       <property name="modelId">ZW089</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0002:0059,0102:0059,0202:0059</property>
+      <property name="dbReference">64</property>
       <property name="defaultAssociations">1</property>
     </properties>
 

diff --git a/ESH-INF/thing/aeon_zw095_0_0.xml b/ESH-INF/thing/aeon_zw095_0_0.xml
@@ -91,6 +91,7 @@
       <property name="modelId">ZW095</property>
       <property name="manufacturerId">0086</property>
       <property name="manufacturerRef">0102:005F</property>
+      <property name="dbReference">375</property>
     </properties>
 
     <!-- CONFIGURATION DESCRIPTIONS -->