Skip to content

Commit d51ef92

Browse files
cdjacksoncdjackson
authored
Database update (openhab#1096)
Signed-off-by: Chris Jackson <[email protected]>
1 parent 94760eb commit d51ef92

File tree

11 files changed

+961
-52
lines changed

11 files changed

+961
-52
lines changed

‎ESH-INF/thing/homeseer/hsls100_0_0.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ HomeSeer Z-Wave Plus Leak Sensor<br /><h1>Overview</h1><p>Homeseer HS-LS100+ is
2727
</properties>
2828
</channel>
2929
<channel id="alarm_heat" typeId="alarm_heat">
30-
<label>Alarm (heat)</label>
30+
<label>Heat Alarm</label>
3131
<properties>
3232
<property name="binding:*:OnOffType">COMMAND_CLASS_ALARM;type=HEAT</property>
3333
</properties>
3434
</channel>
3535
<channel id="alarm_flood" typeId="alarm_flood">
36-
<label>Alarm (flood)</label>
36+
<label>Flood Alarm</label>
3737
<properties>
3838
<property name="binding:*:OnOffType">COMMAND_CLASS_ALARM;type=FLOOD</property>
3939
</properties>
4040
</channel>
41-
<channel id="alarm_burglar" typeId="alarm_burglar">
42-
<label>Alarm (burglar)</label>
41+
<channel id="alarm_tamper" typeId="alarm_tamper">
42+
<label>Tamper Alarm</label>
4343
<properties>
4444
<property name="binding:*:OnOffType">COMMAND_CLASS_ALARM;type=BURGLAR</property>
4545
</properties>

‎ESH-INF/thing/popp/123665_0_0.xml

+15-9
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<thing-type id="popp_123665_00_000" listed="false">
99
<label>123665 Wall Plug Meter Switch</label>
1010
<description><![CDATA[
11-
Wall Plug Meter Switch<br /><h1>Overview</h1><p>Controlable plug for wall outlets including energy and power meter.</p> <br /><h2>Inclusion Information</h2><p>Turn the controller into inclusion mode. </p> <p>Press the button on the wall plug 3 times within a period of around 2 seconds.</p> <br /><h2>Exclusion Information</h2><p>Turn the controller into exclusion mode. </p> <p>Press the button on the wall plug 3 times within a period of around 2 seconds.</p>
11+
Wall Plug Meter Switch<br /><h1>Overview</h1><p>Z-Wave UK Plug-in Switch plus Power Meter </p> <br /><h2>Inclusion Information</h2><ul><li>Turn the controller into inclusion mode. </li> <li>Press the button on the wall plug 3 times within a period of around 2 seconds.</li> </ul><br /><h2>Exclusion Information</h2><ul><li>Turn the controller into exclusion mode. </li> <li>Press the button on the wall plug 3 times within a period of around 2 seconds.</li> </ul>
1212
]]></description>
1313
<category>PowerOutlet</category>
1414

@@ -81,35 +81,41 @@ Wall Plug Meter Switch<br /><h1>Overview</h1><p>Controlable plug for wall outlet
8181
min="0" max="65535">
8282
<label>1: Watt Meter Report Period</label>
8383
<description><![CDATA[
84-
See the overview field for parameter 1<br /><h1>Overview</h1><p>If the setting is configured for 1hour (set value =720), the device will report its instant power consumption every 1 hour to Z-Wave Controller. (in seconds)</p>
84+
Time frame for reporting instant power consumption<br /><h1>Overview</h1><p>If the setting is configured for 1 hour (set value = 720), the device will report its instant power consumption every 1 hour to Z-Wave Controller. (one unit = 5 seconds)</p>
8585
]]></description>
8686
<default>720</default>
87-
<options>
88-
<option value="99999">TEST</option>
89-
</options>
9087
<limitToOptions>false</limitToOptions>
9188
</parameter>
9289

9390
<parameter name="config_2_2" type="integer" groupName="configuration"
9491
min="0" max="65535">
9592
<label>2: KWH Meter Report Period</label>
9693
<description><![CDATA[
97-
See the overview field for parameter 2<br /><h1>Overview</h1><p>if the setting is configured for 1hour (set value =6), the device will report its Accumulated Power Consumption (KW/h) every hour (in seconds)</p>
94+
Time frame for reporting Accumulated Power Consumption<br /><h1>Overview</h1><p>if the setting is configured for 1hour (set value = 6), the device will report its Accumulated Power Consumption (KW/h) every hour (one unit = 10 min)</p>
9895
]]></description>
9996
<default>6</default>
10097
</parameter>
10198

99+
<parameter name="config_3_2" type="integer" groupName="configuration"
100+
min="0" max="65535">
101+
<label>3: Threshold of Watt for Load caution</label>
102+
<description><![CDATA[
103+
Warn when wattage of load over the preset threshold value<br /><h1>Overview</h1><p>This is a warning when the wattage of load over the preset threshold value, if the load wattage exceeds the setting value the device will send a warning alarm command to the controller. </p>
104+
]]></description>
105+
<default>3000</default>
106+
</parameter>
107+
102108
<parameter name="config_4_2" type="integer" groupName="configuration"
103109
min="0" max="65535">
104110
<label>4: Threshold of KWh for Load caution</label>
105111
<description><![CDATA[
106-
See overview parameter 4<br /><h1>Overview</h1><p>This is a warning when the KWh of load over the preset threshold value, if the Accumulated Power Consumption exceeds the setting value the device will send a warning alarm command to the controller.</p>
112+
Warn if Acc. Power Consumption exceeds the set value<br /><h1>Overview</h1><p>This is a warning when the KWh of load over the preset threshold value, if the Accumulated Power Consumption exceeds the setting value the device will send a warning alarm command to the controller.</p>
107113
]]></description>
108114
<default>10000</default>
109115
</parameter>
110116

111117
<parameter name="config_5_1" type="integer" groupName="configuration">
112-
<label>5: Ignore start level</label>
118+
<label>5: Ignore start level after pwr outage</label>
113119
<default>1</default>
114120
<options>
115121
<option value="0">Switch Off</option>
@@ -119,7 +125,7 @@ See overview parameter 4<br /><h1>Overview</h1><p>This is a warning when the KWh
119125
</parameter>
120126

121127
<parameter name="config_11_1" type="integer" groupName="configuration">
122-
<label>11: Ignore start level</label>
128+
<label>11: Disable Switching Funktion</label>
123129
<default>1</default>
124130
<options>
125131
<option value="0">Disabled</option>

‎ESH-INF/thing/popp/700793_0_0.xml

+106
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<thing:thing-descriptions bindingId="zwave"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:thing="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0"
5+
xsi:schemaLocation="http://eclipse.org/smarthome/schemas/thing-description/v1.0.0
6+
http://eclipse.org/smarthome/schemas/thing-description/v1.0.0">
7+
8+
<thing-type id="popp_700793_00_000" listed="false">
9+
<label>700793 Power Plug</label>
10+
<description><![CDATA[
11+
Power Plug<br /><h1>Overview</h1><p>Controllable plug for wall outlets including energy and power meter.This device is VDE and CE certified </p> <br /><h2>Inclusion Information</h2><p>Press the button on the wall plug 3 times within a period of around 2 seconds. </p> <br /><h2>Exclusion Information</h2><p>Press the button on the wall plug 3 times within a period of around 2 seconds. </p>
12+
]]></description>
13+
<category>PowerOutlet</category>
14+
15+
<!-- CHANNEL DEFINITIONS -->
16+
<channels>
17+
<channel id="switch_binary" typeId="switch_binary">
18+
<label>Switch</label>
19+
<properties>
20+
<property name="binding:*:OnOffType">COMMAND_CLASS_SWITCH_BINARY</property>
21+
</properties>
22+
</channel>
23+
<channel id="meter_watts" typeId="meter_watts">
24+
<label>Electric meter (watts)</label>
25+
<properties>
26+
<property name="binding:*:DecimalType">COMMAND_CLASS_METER;type=E_W</property>
27+
</properties>
28+
</channel>
29+
<channel id="meter_kwh" typeId="meter_kwh">
30+
<label>Electric meter (kWh)</label>
31+
<properties>
32+
<property name="binding:*:DecimalType">COMMAND_CLASS_METER;type=E_KWh</property>
33+
</properties>
34+
</channel>
35+
<channel id="alarm_power" typeId="alarm_power">
36+
<label>Alarm (power)</label>
37+
<properties>
38+
<property name="binding:*:OnOffType">COMMAND_CLASS_ALARM;type=POWER_MANAGEMENT</property>
39+
</properties>
40+
</channel>
41+
<channel id="alarm_heat" typeId="alarm_heat">
42+
<label>Alarm (heat)</label>
43+
<properties>
44+
<property name="binding:*:OnOffType">COMMAND_CLASS_ALARM;type=HEAT</property>
45+
</properties>
46+
</channel>
47+
<channel id="alarm_system" typeId="alarm_system">
48+
<label>Alarm (system)</label>
49+
<properties>
50+
<property name="binding:*:OnOffType">COMMAND_CLASS_ALARM;type=SYSTEM</property>
51+
</properties>
52+
</channel>
53+
</channels>
54+
55+
<!-- DEVICE PROPERTY DEFINITIONS -->
56+
<properties>
57+
<property name="vendor">Popp &amp; Co</property>
58+
<property name="modelId">700793</property>
59+
<property name="manufacturerId">0154</property>
60+
<property name="manufacturerRef">0003:1002</property>
61+
<property name="dbReference">940</property>
62+
<property name="defaultAssociations">1</property>
63+
</properties>
64+
65+
<!-- CONFIGURATION DESCRIPTIONS -->
66+
<config-description>
67+
68+
<!-- GROUP DEFINITIONS -->
69+
<parameter-group name="configuration">
70+
<context>setup</context>
71+
<label>Configuration Parameters</label>
72+
</parameter-group>
73+
74+
<parameter-group name="association">
75+
<context>link</context>
76+
<label>Association Groups</label>
77+
</parameter-group>
78+
79+
<!-- PARAMETER DEFINITIONS -->
80+
<parameter name="config_1_1" type="integer" groupName="configuration">
81+
<label>1: Condition after power failure</label>
82+
<description>Condition after power failure</description>
83+
<default>0</default>
84+
<options>
85+
<option value="0">Always Off</option>
86+
<option value="1">Always On</option>
87+
<option value="2">Last state</option>
88+
</options>
89+
</parameter>
90+
91+
<!-- ASSOCIATION DEFINITIONS -->
92+
<parameter name="group_1" type="text" groupName="association">
93+
<label>1: Lifeline</label>
94+
</parameter>
95+
96+
<!-- STATIC DEFINITIONS -->
97+
<parameter name="node_id" type="integer" min="1" max="232" readOnly="true" required="true">
98+
<label>Node ID</label>
99+
<advanced>true</advanced>
100+
</parameter>
101+
102+
</config-description>
103+
104+
</thing-type>
105+
106+
</thing:thing-descriptions>

‎ESH-INF/thing/shenzhen/motionsensor_0_0.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ PIR Motion Sensor<br /><h1>Overview</h1><p>This product can be included and oper
4444
<property name="vendor">Shenzhen Neo Electronics Co., Ltd</property>
4545
<property name="modelId">Motion Sensor</property>
4646
<property name="manufacturerId">0258</property>
47-
<property name="manufacturerRef">0003:0083,0003:008D,0003:1083,0003:108D</property>
48-
<property name="versionMax">3.79</property>
47+
<property name="manufacturerRef">0003:0083,0003:008D,0003:1083</property>
4948
<property name="dbReference">401</property>
5049
<property name="defaultAssociations">1</property>
5150
</properties>

0 commit comments

Comments
 (0)