Skip to content

Commit

Permalink
Merge branch 'master' into transactions
Browse files Browse the repository at this point in the history
* master:
  Database update (openhab#86)
  removed (wrong) state options for binary switches and fixed category (openhab#85)
  Database update (openhab#84)
  Minor fix in association group info (openhab#83)
  • Loading branch information
cdjackson committed Sep 10, 2016
2 parents 91d8e17 + 90decf2 commit 5fd6064
Show file tree
Hide file tree
Showing 16 changed files with 911 additions and 33 deletions.
10 changes: 2 additions & 8 deletions ESH-INF/thing/_channels.xml
Original file line number Diff line number Diff line change
Expand Up @@ -645,14 +645,8 @@
<channel-type id="switch_binary">
<item-type>Switch</item-type>
<label>Switch</label>
<description>Switch the light on and off</description>
<category>Light</category>
<state>
<options>
<option value="On">On</option>
<option value="Off">Off</option>
</options>
</state>
<description>Switch the power on and off</description>
<category>Switch</category>
</channel-type>

<!-- Brightness (Dimmer) Channel -->
Expand Down
2 changes: 1 addition & 1 deletion ESH-INF/thing/aeon_zw099_0_0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<thing-type id="aeon_zw099_00_000" listed="false">
<label>ZW099 Smart Dimmer 6</label>
<description><![CDATA[
Smart Dimmer 6<br /><h1>Overview</h1><p>Turn the primary controller of Z-Wave network into inclusion mode, short press the product’s Action button that you can find on the product's housing. </p> <br /><h2>Inclusion Information</h2><p>1. Insert the Smart Dimmer to power socket, The RGB LED will be colorful gradient status.<br />2. Let the primary controller into inclusion mode (If you don’t know how to do this, refer to its manual).<br />3. Press the Action button.<br />4. If the inclusion success, Smart Dimmer LED will be solid. Otherwise, the LED will remain colorful gradient status, in which you need to repeat the process from step 2. </p> <br /><h2>Exclusion Information</h2><p>1. Insert the Smart Dimmer to power socket, The Smart Dimmer LED will be solid.<br />2. Let the primary controller into remove mode (If you don’t know how to do this, refer to its manual).<br />3. Press the Action button.<br />4. If the remove is successful, Smart Dimmer LED will be colorful gradient status. If Smart Dimmer LED still be solid, please repeat the process from step 2.</p>
Smart Dimmer 6<br /><h1>Overview</h1><p>Turn the primary controller of Z-Wave network into inclusion mode, short press the product’s Action button that you can find on the product's housing.</p> <p>Endpoint 1 is used to Set/Get the state of output load.</p> <p>Endpoint 2 is used to Set/Get the brightness level of RGB LED when it is in Night light mode. </p> <br /><h2>Inclusion Information</h2><p>1. Insert the Smart Dimmer to power socket, The RGB LED will be colorful gradient status.<br />2. Let the primary controller into inclusion mode (If you don’t know how to do this, refer to its manual).<br />3. Press the Action button.<br />4. If the inclusion success, Smart Dimmer LED will be solid. Otherwise, the LED will remain colorful gradient status, in which you need to repeat the process from step 2. </p> <br /><h2>Exclusion Information</h2><p>1. Insert the Smart Dimmer to power socket, The Smart Dimmer LED will be solid.<br />2. Let the primary controller into remove mode (If you don’t know how to do this, refer to its manual).<br />3. Press the Action button.<br />4. If the remove is successful, Smart Dimmer LED will be colorful gradient status. If Smart Dimmer LED still be solid, please repeat the process from step 2.</p>
]]></description>

<!-- CHANNEL DEFINITIONS -->
Expand Down
13 changes: 13 additions & 0 deletions ESH-INF/thing/cooper_rf9517_0_0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,19 @@ Accessory Switch<br /><h1>Overview</h1><p>Aspire RF Accessory Switch Compatible
<!-- 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"
min="0" max="255">
<label>1: Delayed OFF time</label>
<description>The time in seconds the switch will delay when trigger the delayed off feature</description>
<default>0</default>
</parameter>

<!-- ASSOCIATION DEFINITIONS -->
<parameter-group name="association">
<context>link</context>
Expand Down
4 changes: 2 additions & 2 deletions ESH-INF/thing/fibaro_fgd212_0_0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
http://eclipse.org/smarthome/schemas/thing-description/v1.0.0">

<thing-type id="fibaro_fgd212_00_000" listed="false">
<label>FGD212 Fibaro Dimmer 2</label>
<description>Fibaro Dimmer 2</description>
<label>FGD212 Dimmer 2</label>
<description>Dimmer 2</description>

<!-- CHANNEL DEFINITIONS -->
<channels>
Expand Down
6 changes: 3 additions & 3 deletions ESH-INF/thing/fibaro_fgr221_0_0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
http://eclipse.org/smarthome/schemas/thing-description/v1.0.0">

<thing-type id="fibaro_fgr221_00_000" listed="false">
<label>FGR221 Fibaro FGR221 Roller Shutter Controller</label>
<description>Fibaro FGR221 Roller Shutter Controller</description>
<label>FGR221 Roller Shutter Controller</label>
<description>Roller Shutter Controller</description>

<!-- CHANNEL DEFINITIONS -->
<channels>
Expand All @@ -32,7 +32,7 @@
<property name="vendor">Fibaro System</property>
<property name="modelId">FGR221</property>
<property name="manufacturerId">010F</property>
<property name="manufacturerRef">0300:100A,0300:0106,0300:0104,0300:0107</property>
<property name="manufacturerRef">0300:0104,0300:0106,0300:0107,0300:100A</property>
<property name="dbReference">132</property>
<property name="defaultAssociations">3</property>
</properties>
Expand Down
6 changes: 3 additions & 3 deletions ESH-INF/thing/fibaro_fgrgbw_0_0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
http://eclipse.org/smarthome/schemas/thing-description/v1.0.0">

<thing-type id="fibaro_fgrgbw_00_000" listed="false">
<label>FGRGBW Fibaro RGBW Controller</label>
<description>Fibaro RGBW Controller</description>
<label>FGRGBW RGBW Controller</label>
<description>RGBW Controller</description>

<!-- CHANNEL DEFINITIONS -->
<channels>
Expand Down Expand Up @@ -84,7 +84,7 @@
<property name="vendor">Fibaro System</property>
<property name="modelId">FGRGBW</property>
<property name="manufacturerId">010F</property>
<property name="manufacturerRef">0900:1000,0900:2000,0900:4000,0900:3000</property>
<property name="manufacturerRef">0900:1000,0900:2000,0900:3000,0900:4000</property>
<property name="dbReference">131</property>
<property name="commandClass:SWITCH_MULTILEVEL:1">getSupported=false</property>
<property name="commandClass:SWITCH_MULTILEVEL:2">getSupported=false</property>
Expand Down
1 change: 1 addition & 0 deletions ESH-INF/thing/fibaro_fgrm222_0_0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
<property name="modelId">FGRM222</property>
<property name="manufacturerId">010F</property>
<property name="manufacturerRef">0301:1001,0302:1000</property>
<property name="versionMax">2.2</property>
<property name="dbReference">116</property>
<property name="defaultAssociations">3</property>
</properties>
Expand Down
263 changes: 263 additions & 0 deletions ESH-INF/thing/fibaro_fgrm222_25_25.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,263 @@
<?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="fibaro_fgrm222_25_025" listed="false">
<label>FGRM222 Roller Shutter</label>
<description>Roller Shutter</description>

<!-- CHANNEL DEFINITIONS -->
<channels>
<channel id="switch_binary" typeId="switch_binary">
<label>Switch</label>
<properties>
<property name="binding:*:OnOffType">SWITCH_BINARY</property>
</properties>
</channel>
<channel id="switch_dimmer" typeId="switch_dimmer">
<label>Dimmer</label>
<properties>
<property name="binding:*:PercentType">SWITCH_MULTILEVEL,BASIC</property>
<property name="binding:Command:OnOffType">SWITCH_MULTILEVEL,BASIC</property>
</properties>
</channel>
<channel id="sensor_power" typeId="sensor_power">
<label>Sensor (power)</label>
<properties>
<property name="binding:*:DecimalType">SENSOR_MULTILEVEL;type=POWER</property>
</properties>
</channel>
<channel id="meter_watts" typeId="meter_watts">
<label>Electric meter (watts)</label>
<properties>
<property name="binding:*:DecimalType">METER;type=E_W</property>
</properties>
</channel>
<channel id="meter_kwh" typeId="meter_kwh">
<label>Electric meter (kWh)</label>
<properties>
<property name="binding:*:DecimalType">METER;type=E_KWh</property>
</properties>
</channel>
</channels>

<!-- DEVICE PROPERTY DEFINITIONS -->
<properties>
<property name="vendor">Fibaro System</property>
<property name="modelId">FGRM222</property>
<property name="manufacturerId">010F</property>
<property name="manufacturerRef">0302:1000</property>
<property name="versionMin">25.25</property>
<property name="dbReference">413</property>
<property name="defaultAssociations">3</property>
</properties>

<!-- CONFIGURATION DESCRIPTIONS -->
<config-description>

<!-- PARAMETER DEFINITIONS -->
<parameter-group name="configuration">
<context>setup</context>
<label>Configuration Parameters</label>
</parameter-group>

<parameter name="config_3_1" type="integer" groupName="configuration">
<label>3: Reports type</label>
<description>Parameters value shoud be set to 1 if the module operates in Venetian Blind mode.</description>
<default>0</default>
<options>
<option value="0">Blind position reports sent to the main controller using Z-Wave Comman</option>
<option value="1">Blind position reports sent to the main controller using Fibar Command</option>
</options>
</parameter>

<parameter name="config_10_1" type="integer" groupName="configuration">
<label>10: Roller Shutter operating modes</label>
<default>1</default>
<options>
<option value="0">Roller Blind Mode, without positioning</option>
<option value="1">Roller Blind Mode, with positioning</option>
<option value="2">Venetian Blind Mode, with positioning</option>
<option value="3">Gate Mode, without positioning</option>
<option value="4">Gate Mode, with positioning</option>
</options>
</parameter>

<parameter name="config_12_2" type="integer" groupName="configuration"
min="0" max="65535">
<label>12: Turning time/ delay time</label>
<description>In Venetian Blind mode (parameter 10 set to 2) the parameter determines time of full turn of the lamellas. In Gate Mode (parameter 10 set to 3 or 4) the parameter defines the delay time after which an open gate starts closing. Type range</description>
<default>150</default>
</parameter>

<parameter name="config_13_1" type="integer" groupName="configuration">
<label>13: Lamellas positioning mode</label>
<description>Parameter influences the lamellas positioning in venetian blind mode (parameter 10 set to 2)</description>
<default>2</default>
<options>
<option value="0">Lamellas return to previously set position only in case of the main co</option>
<option value="1">Lamellas return to previously set position in case of the main control</option>
<option value="2">Lamellas return to previously set position in case of the main control</option>
</options>
</parameter>

<parameter name="config_14_1" type="integer" groupName="configuration">
<label>14: Switch type</label>
<description>parameter settings are relevant for Roller Blind Mode and Venetian Blind Mode (parameter 10 set to 0, 1, 2).</description>
<default>0</default>
<options>
<option value="0">Momentary switches</option>
<option value="1">Toggle switches</option>
<option value="2">Single, momentary switch.</option>
</options>
</parameter>

<parameter name="config_17_1" type="integer" groupName="configuration"
min="0" max="255">
<label>17: Delay time after S2</label>
<description>In roller blind mode or venetian blind mode (parameter 10 set to 0, 1, 2) the parameter determines when the Roller Shutter relays are turned off after reaching a limit switch. In Gate Mode (parameter 10 set to 3 or 4) the parameter determines a time perio</description>
<default>10</default>
</parameter>

<parameter name="config_18_1" type="integer" groupName="configuration"
min="0" max="255">
<label>18: Motor operation detection</label>
<description>Power threshold to be interpreted as reaching a limit switch.</description>
<default>10</default>
</parameter>

<parameter name="config_22_2" type="integer" groupName="configuration"
min="0" max="65535">
<label>22: Motor operation time</label>
<description>Time period for the motor to continue operation.</description>
<default>10</default>
</parameter>

<parameter name="config_29_1" type="integer" groupName="configuration">
<label>29: Forced Roller Shutter calibration</label>
<description>Seting the parameter to 1 Roller Shutter enters the calibration mode. Parameter is only only relevant if a Roller Shutter is set to work in positioning mode (parameter 10 set to 1, 2 or 4).</description>
<default>0</default>
<options>
<option value="0">Deactivated</option>
<option value="1">Start calibration process</option>
</options>
</parameter>

<parameter name="config_30_1" type="integer" groupName="configuration">
<label>30: Response to General Alarm</label>
<default>2</default>
<options>
<option value="0">No response to alarm frames</option>
<option value="1">Open Blind</option>
<option value="2">Close Blind</option>
</options>
</parameter>

<parameter name="config_31_1" type="integer" groupName="configuration">
<label>31: Response to Water Flood Alarm</label>
<default>0</default>
<options>
<option value="0">No response to alarm frames</option>
<option value="1">Open Blind</option>
<option value="2">Close Blind</option>
</options>
</parameter>

<parameter name="config_32_1" type="integer" groupName="configuration">
<label>32: Response to Smoke, CO, CO2 Alarm</label>
<default>1</default>
<options>
<option value="0">No response to alarm frames</option>
<option value="1">Open Blind</option>
<option value="2">Close Blind</option>
</options>
</parameter>

<parameter name="config_33_1" type="integer" groupName="configuration">
<label>33: Response to Temperature Alarm</label>
<default>1</default>
<options>
<option value="0">No response to alarm frames</option>
<option value="1">Open Blind</option>
<option value="2">Close Blind</option>
</options>
</parameter>

<parameter name="config_35_1" type="integer" groupName="configuration">
<label>35: Managing lamellas in response to alarm</label>
<description>In Venetian Blind Mode (parameter 10 set to 2), the parameter determines how the lamellas will react upon alarm detection.</description>
<default>1</default>
<options>
<option value="0">Do not change lamellas position</option>
<option value="1">Set lamellas to their extreme position</option>
</options>
</parameter>

<parameter name="config_40_1" type="integer" groupName="configuration"
min="0" max="100">
<label>40: Power reports</label>
<description>Power level change that will result in new power value report being sent. value is a percentage of the previous report.</description>
<default>10</default>
</parameter>

<parameter name="config_42_2" type="integer" groupName="configuration"
min="0" max="65534">
<label>42: Periodic power or energy reports</label>
<description>Time to the next report. Value of 0 means the reports are turned off.</description>
<default>3600</default>
</parameter>

<parameter name="config_43_1" type="integer" groupName="configuration"
min="0" max="254">
<label>43: Energy reports</label>
<description>Energy level change which will result in new energy value report being sent. Value of 0 means the reports are turned off.</description>
<default>10</default>
</parameter>

<parameter name="config_44_1" type="integer" groupName="configuration">
<label>44: Self-measurement</label>
<description>Enables/disables to include the power and energy used by itself in reports to main controller.</description>
<default>0</default>
<options>
<option value="0">Disabled</option>
<option value="1">Activated</option>
</options>
</parameter>

<parameter name="config_50_1" type="integer" groupName="configuration">
<label>50: Scenes/ Associations activation</label>
<description>Parameter determines whether scenes or associations are activated by the switch keys.</description>
<default>0</default>
<options>
<option value="0">Associations Active</option>
<option value="1">Scenes Active</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: Momentary click</label>
<multipleLimit>16</multipleLimit>
</parameter>

<parameter name="group_2" type="text" groupName="association" multiple="true">
<label>2: Momentary hold</label>
<multipleLimit>16</multipleLimit>
</parameter>

<parameter name="group_3" type="text" groupName="association">
<label>3: Controller Updates</label>
</parameter>

</config-description>

</thing-type>
</thing:thing-descriptions>

0 comments on commit 5fd6064

Please sign in to comment.