Skip to content

Commit

Permalink
Merge pull request openhab#810 from cdjackson/zwave-master
Browse files Browse the repository at this point in the history 
ZWave revert bridge initialisation check
  • Loading branch information
@cdjackson
cdjackson committed Apr 18, 2016
2 parents b8a2e8b + 01f17f6 commit 2759369
Show file tree
Hide file tree
Showing 6 changed files with 121 additions and 124 deletions.
6 changes: 3 additions & 3 deletions addons/binding/org.openhab.binding.zwave/ESH-INF/thing/_controller_serial.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<label>Soft Reset Controller</label>
<description>Resets the Z-Wave stick - similar to removing the stick from the USB.</description>
<advanced>true</advanced>
<default></default>
<default>0</default>
<options>
<option value="-232323">send</option>
</options>
Expand All @@ -105,7 +105,7 @@
<label>Hard Reset Controller</label>
<description>Hard resets the Z-Wave stick - this will erase all configuration from the controller!</description>
<advanced>true</advanced>
<default></default>
<default>0</default>
<options>
<option value="-232323">send</option>
</options>
Expand All @@ -115,7 +115,7 @@
<label>Exclude Devices</label>
<description>Puts the controller into Exclusion mode.</description>
<advanced>true</advanced>
<default></default>
<default>0</default>
<options>
<option value="-232323">send</option>
</options>
Expand Down
79 changes: 44 additions & 35 deletions addons/binding/org.openhab.binding.zwave/ESH-INF/thing/aeon_dsc06_0_0.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@
<label>Configuration Parameters</label>
</parameter-group>

<parameter name="config_1_1" type="integer" groupName="configuration"
min="0" max="1">
<parameter name="config_1_1" type="integer" groupName="configuration">
<label>1: Multilevel Sensor Report Content</label>
<default>0</default>
<options>
Expand All @@ -65,14 +64,25 @@
</options>
</parameter>

<parameter name="config_2_2" type="integer" groupName="configuration"
min="0" max="65535">
<label>2: Make SES blink</label>
<parameter name="config_2_2_000000FF" type="integer" groupName="configuration"
min="0" max="255">
<label>2: Cycle time of blinking SES light</label>
<description><![CDATA[
Cycle blink length in 1/10ths of second<br /><h1>Overview</h1><p>Configuration Value 2 is to Specify the Cycle of on/off, the unit of it is 0.1 second. For example: if we set Configuration Value 1 to '15', Configuration Value 2 to '10',then SES will open 0.5 second, close 0.5 second, and repeat for 14 times.</p>
]]></description>
<default>0</default>
</parameter>

<parameter name="config_80_1" type="integer" groupName="configuration"
min="0" max="2">
<parameter name="config_2_2_0000FF00" type="integer" groupName="configuration"
min="0" max="255">
<label>2: Make SES blink (seconds)</label>
<description><![CDATA[
blink for this many seconds<br /><h1>Overview</h1><p>Configuration Value 1 is to Specify the time that SES need blink, The unit is Second;</p>
]]></description>
<default>0</default>
</parameter>

<parameter name="config_80_1" type="integer" groupName="configuration">
<label>80: Automatic Notifications</label>
<description><![CDATA[
Enable or disable automatic notifications<br /><h1>Overview</h1><p>Enables automatic notifications to associated devices whenever there is a state change.</p> (0=nothing, 1=hail CC, 2=basic CC report)
Expand All @@ -85,8 +95,7 @@ Enable or disable automatic notifications<br /><h1>Overview</h1><p>Enables autom
</options>
</parameter>

<parameter name="config_90_1" type="integer" groupName="configuration"
min="0" max="2">
<parameter name="config_90_1" type="integer" groupName="configuration">
<label>90: Enable/disable Parameter 91 and 92</label>
<description>Enables/disables parameter 91 and 92 below</description>
<default>0</default>
Expand Down Expand Up @@ -114,17 +123,7 @@ Minimum change in wattage % to trigger event<br /><h1>Overview</h1><p>The value
<default>10</default>
</parameter>

<parameter name="config_100_1" type="integer" groupName="configuration"
min="0" max="1">
<label>100: Set 100 to 103 to default</label>
<default>0</default>
<options>
<option value="0">Reset</option>
</options>
</parameter>

<parameter name="config_101_4" type="integer" groupName="configuration"
min="0" max="65535">
<parameter name="config_101_4" type="integer" groupName="configuration">
<label>101: Group 1 report</label>
<default>8</default>
<options>
Expand All @@ -135,8 +134,7 @@ Minimum change in wattage % to trigger event<br /><h1>Overview</h1><p>The value
</options>
</parameter>

<parameter name="config_102_4" type="integer" groupName="configuration"
min="0" max="65535">
<parameter name="config_102_4" type="integer" groupName="configuration">
<label>102: Group 2 report</label>
<default>0</default>
<options>
Expand All @@ -147,8 +145,7 @@ Minimum change in wattage % to trigger event<br /><h1>Overview</h1><p>The value
</options>
</parameter>

<parameter name="config_103_4" type="integer" groupName="configuration"
min="0" max="65535">
<parameter name="config_103_4" type="integer" groupName="configuration">
<label>103: Group 3 report</label>
<default>0</default>
<options>
Expand All @@ -159,15 +156,6 @@ Minimum change in wattage % to trigger event<br /><h1>Overview</h1><p>The value
</options>
</parameter>

<parameter name="config_110_1" type="integer" groupName="configuration"
min="0" max="1">
<label>110: Set 111 to 113 to default</label>
<default>0</default>
<options>
<option value="0">Reset</option>
</options>
</parameter>

<parameter name="config_111_4" type="integer" groupName="configuration"
min="0" max="65535">
<label>111: Interval Group 1</label>
Expand Down Expand Up @@ -195,8 +183,29 @@ Minimum change in wattage % to trigger event<br /><h1>Overview</h1><p>The value
<default>0</default>
</parameter>

<parameter name="config_255_1" type="integer" groupName="configuration"
min="0" max="1">
<!-- ACTION DEFINITIONS -->
<parameter-group name="actions">
<context>setup</context>
<label>Actions</label>
</parameter-group>

<parameter name="config_100_1_wo" type="integer" groupName="configuration">
<label>100: Set 100 to 103 to default</label>
<default>0</default>
<options>
<option value="0">Reset</option>
</options>
</parameter>

<parameter name="config_110_1_wo" type="integer" groupName="configuration">
<label>110: Set 111 to 113 to default</label>
<default>0</default>
<options>
<option value="0">Reset</option>
</options>
</parameter>

<parameter name="config_255_1_wo" type="integer" groupName="configuration">
<label>255: Device Reset</label>
<default>0</default>
<options>
Expand Down
40 changes: 19 additions & 21 deletions addons/binding/org.openhab.binding.zwave/ESH-INF/thing/aeon_zw096_0_0.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ Smart Switch 6<br /><h1>Overview</h1><p>Aeon Labs Smart Switch is a Z-Wave power
<label>Configuration Parameters</label>
</parameter-group>

<parameter name="config_3_1" type="integer" groupName="configuration"
min="0" max="1">
<parameter name="config_3_1" type="integer" groupName="configuration">
<label>3: Current overload protection enable</label>
<description><![CDATA[
Current overload protection enable<br /><h1>Overview</h1><p>Current Overload Protection. Load will be closed when the Current overrun (US: 15.5A, other country: 16.2A) and the time more than 2 minutes (0=disabled, 1=enabled).</p>
Expand All @@ -82,8 +81,7 @@ Current overload protection enable<br /><h1>Overview</h1><p>Current Overload Pro
</options>
</parameter>

<parameter name="config_20_1" type="integer" groupName="configuration"
min="0" max="2">
<parameter name="config_20_1" type="integer" groupName="configuration">
<label>20: Output load after re-power</label>
<description><![CDATA[
Configure the output load status after re‐power<br /><h1>Overview</h1><p>Configure the output load status after re-power on<br />(0=last status, 1=always on, 2=always off)</p>
Expand All @@ -96,8 +94,7 @@ Configure the output load status after re‐power<br /><h1>Overview</h1><p>Confi
</options>
</parameter>

<parameter name="config_80_1" type="integer" groupName="configuration"
min="0" max="2">
<parameter name="config_80_1" type="integer" groupName="configuration">
<label>80: Enable send to associated devices</label>
<description><![CDATA[
Enable to send notifications to Group 1<br /><h1>Overview</h1><p>Enable to send notifications to associated devices (Group 1) when the state of Micro Switch’s load changed (0=nothing, 1=hail CC, 2=basic CC report).</p>
Expand All @@ -110,8 +107,7 @@ Enable to send notifications to Group 1<br /><h1>Overview</h1><p>Enable to send
</options>
</parameter>

<parameter name="config_81_1" type="integer" groupName="configuration"
min="0" max="2">
<parameter name="config_81_1" type="integer" groupName="configuration">
<label>81: Configure LED state</label>
<description><![CDATA[
Configure the state of the LED<br /><h1>Overview</h1><p>Configure the state of LED when it is in 3 modes below:</p> <ul><li>0= The LED will follow the status (on/off) of its load (Energy mode).</li> <li>1= When the state of Switch’s load changed, The LED will follow the status (on/off) of its load, but the red LED will turn off after 5 seconds if there is no any switch action (momentary indicate mode).</li> <li>2= Night light mode.</li> </ul>
Expand Down Expand Up @@ -174,8 +170,7 @@ Green brightness in energy mode (%)<br /><h1>Overview</h1><p>Configure the brigh
<default>50</default>
</parameter>

<parameter name="config_90_1" type="integer" groupName="configuration"
min="0" max="1">
<parameter name="config_90_1" type="integer" groupName="configuration">
<label>90: Enable items 91 and 92</label>
<description><![CDATA[
Enables/disables parameter 91 and 92<br /><h1>Overview</h1><p>Enables/disables parameter 91 and 92 below (1=enabled, 0=disabled).</p>
Expand Down Expand Up @@ -205,13 +200,6 @@ minimum change in wattage percent<br /><h1>Overview</h1><p>The value here repres
<default>5</default>
</parameter>

<parameter name="config_100_1" type="integer" groupName="configuration"
min="0" max="1">
<label>100: Set 101‐103 to default.</label>
<description>Set 101‐103 to default.</description>
<default>0</default>
</parameter>

<parameter name="config_101_4_000000FF" type="integer" groupName="configuration"
min="0" max="15">
<label>101: Values to send to group 1</label>
Expand Down Expand Up @@ -248,8 +236,7 @@ Group 2 automatic update interval<br /><h1>Overview</h1><p>The time interval of
<default>600</default>
</parameter>

<parameter name="config_252_1" type="integer" groupName="configuration"
min="0" max="1">
<parameter name="config_252_1" type="integer" groupName="configuration">
<label>252: Configuration Locked</label>
<description><![CDATA[
Enable/disable Configuration Locked (0 =disable, 1 = enable). <br /><h1>Overview</h1><p>Enable/disable Configuration Locked (0 =disable, 1 =enable).</p>
Expand All @@ -261,8 +248,19 @@ Enable/disable Configuration Locked (0 =disable, 1 = enable). <br /><h1>Overview
</options>
</parameter>

<parameter name="config_255_1" type="integer" groupName="configuration"
min="0" max="1">
<!-- ACTION DEFINITIONS -->
<parameter-group name="actions">
<context>setup</context>
<label>Actions</label>
</parameter-group>

<parameter name="config_100_1_wo" type="integer" groupName="configuration">
<label>100: Set 101‐103 to default.</label>
<description>Set 101‐103 to default.</description>
<default>0</default>
</parameter>

<parameter name="config_255_1_wo" type="integer" groupName="configuration">
<label>255: RESET</label>
<description><![CDATA[
Reset the device to defaults<br /><h1>Overview</h1><p>Reset configuration set up to default setting.</p>
Expand Down
Loading

0 comments on commit 2759369

Please sign in to comment.