Skip to content

Commit a0b1e44

Browse files
authored
Database update (openhab#1119)
Signed-off-by: Chris Jackson <[email protected]>
1 parent 06ea151 commit a0b1e44

18 files changed

+408
-175
lines changed

ESH-INF/thing/eco/dwzwave25_0_0.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ Z-Wave Door/Window Sensor<br /><h1>Overview</h1><p>Z-Wave+ enabled device which
2626
<property name="binding:*:OnOffType">COMMAND_CLASS_ALARM;type=ACCESS_CONTROL</property>
2727
</properties>
2828
</channel>
29-
<channel id="alarm_burglar" typeId="alarm_burglar">
30-
<label>Alarm (burglar)</label>
29+
<channel id="sensor_door" typeId="sensor_door">
30+
<label>Sensor (Binary)</label>
3131
<properties>
32-
<property name="binding:*:OnOffType">COMMAND_CLASS_ALARM;type=BURGLAR</property>
32+
<property name="binding:*:OpenClosedType">COMMAND_CLASS_ALARM</property>
3333
</properties>
3434
</channel>
3535
<channel id="alarm_power" typeId="alarm_power">

ESH-INF/thing/fibaro/fgr222_24_24.xml

-24
Original file line numberDiff line numberDiff line change
@@ -93,30 +93,6 @@ Roller Shutter 2<br /><h1>Overview</h1><p>The device allows for controlling moto
9393
</parameter-group>
9494

9595
<!-- PARAMETER DEFINITIONS -->
96-
<parameter name="config_1_1" type="integer" groupName="configuration">
97-
<label>1: Local protection</label>
98-
<description><![CDATA[
99-
Enables/disables local protection<br /><h1>Overview</h1><p>Enables/disables protection of local push button.<br />Once the local protection is activated, the module stops responding to S1 and S2 push buttons. SCENE ID and association commands will not be sent as well. The only exception is the B-button. Menu and Z-Wave network inclusion, after the B-button or S1 push button triple click, are still active.</p>
100-
]]></description>
101-
<default>0</default>
102-
<options>
103-
<option value="0">No protection</option>
104-
<option value="2">Local protection active</option>
105-
</options>
106-
</parameter>
107-
108-
<parameter name="config_2_1" type="integer" groupName="configuration">
109-
<label>2: Radio protection</label>
110-
<description><![CDATA[
111-
Enables/disables RF protection<br /><h1>Overview</h1><p>Enables/disables RF protection. If activated device stops responding to command frames. Configuration and polling still possible.</p>
112-
]]></description>
113-
<default>0</default>
114-
<options>
115-
<option value="0">No protection</option>
116-
<option value="2">RF protection active</option>
117-
</options>
118-
</parameter>
119-
12096
<parameter name="config_3_1" type="integer" groupName="configuration">
12197
<label>3: Reports type</label>
12298
<description>value should be set to 1 if the module operates in Venetian Blind mode.</description>

ESH-INF/thing/ge/45604_0_0.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77

88
<thing-type id="ge_45604_00_000" listed="false">
99
<label>45604 Outdoor Lighting Control Module</label>
10-
<description>Outdoor Lighting Control Module</description>
10+
<description><![CDATA[
11+
Outdoor Lighting Control Module<br /><h1>Overview</h1><p>The GE Z-Wave Smart Lighting Control Outdoor Module</p> <br /><h2>Inclusion Information</h2><p>Plug In Module</p> <p>Place controller in inclusion mode</p> <p>Press button on module</p> <br /><h2>Exclusion Information</h2><p>Plug In Module</p> <p>Place controller in exclusion mode</p> <p>Press button on module</p>
12+
]]></description>
13+
<category>PowerOutlet</category>
1114

1215
<!-- CHANNEL DEFINITIONS -->
1316
<channels>

ESH-INF/thing/northq/nq9121_3_0.xml

+13-14
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
http://eclipse.org/smarthome/schemas/thing-description/v1.0.0">
77

88
<thing-type id="northq_nq9121_03_000" listed="false">
9-
<label>NQ-9121 NorthQ Q-Gas 9121 (Firmware v3, 2016)</label>
9+
<label>NQ-9121 Q-Gas 9121 (Firmware v3, 2016)</label>
1010
<description><![CDATA[
11-
NorthQ Q-Gas 9121 (Firmware v3, 2016)<br /><h1>Overview</h1><p>The Power Reader is a metering device capable of counting pulses from any electricity or gas meters. The device stores timestamped consumption in its internal memory every 15 minutes. Note: The Power Reader for electricity metering has different firmware than the Power Reader for gas metering. Please make sure you have the appropriate firmware on your device before you start integrating / installing it. </p> <br /><h2>Inclusion Information</h2><p>In order to include the Power/Gas Reader in a Z-Wave network, the device must first have its network settings cleared. New devices fulfill this requirement be default. Power Readers with firmware version up to 3.24 and Gas Readers with firmware version up to 3.30 can have their network settings cleared by pressing 7 times on the button, however it is not recommended to do so because the Z-Wave controller will not be informed that the device has been reset. Power Readers with firmware version equal or larger than 3.29 and Gas Readers with firmware version equal or larger than 3.34 do not reset their network settings if the button has been pressed 7 times. To clear them, any Z-Wave controller must be placed in Exclusion mode first and the button on the device must be pressed 3 times.</p> <br /><h2>Exclusion Information</h2><p>In order to exclude the Power/Gas Reader from a Z-Wave network, place the controller in remove mode first and then press the button on the device 3 times.</p> <br /><h2>Wakeup Information</h2><p>The Power Reader has two functioning modes:</p> <p>- Real-time mode: the device will be awake and keep the antenna on. It will stay in real-time a predefined number of seconds (900).</p> <p>- Normal mode: the device will be in sleep and only wake up according to the interval defined by the WAKE UP SET command.</p>
11+
Q-Gas 9121 (Firmware v3, 2016)<br /><h1>Overview</h1><p>The Power Reader is a metering device capable of counting pulses from any electricity or gas meters. The device stores timestamped consumption in its internal memory every 15 minutes. Note: The Power Reader for electricity metering has different firmware than the Power Reader for gas metering. Please make sure you have the appropriate firmware on your device before you start integrating / installing it. </p> <br /><h2>Inclusion Information</h2><p>In order to include the Power/Gas Reader in a Z-Wave network, the device must first have its network settings cleared. New devices fulfil this requirement be default. Power Readers with firmware version up to 3.24 and Gas Readers with firmware version up to 3.30 can have their network settings cleared by pressing 7 times on the button, however it is not recommended to do so because the Z-Wave controller will not be informed that the device has been reset. Power Readers with firmware version equal or larger than 3.29 and Gas Readers with firmware version equal or larger than 3.34 do not reset their network settings if the button has been pressed 7 times. To clear them, any Z-Wave controller must be placed in Exclusion mode first and the button on the device must be pressed 3 times.</p> <br /><h2>Exclusion Information</h2><p>In order to exclude the Power/Gas Reader from a Z-Wave network, place the controller in remove mode first and then press the button on the device 3 times.</p> <br /><h2>Wakeup Information</h2><p>The Power Reader has two functioning modes:</p> <ul><li>Real-time mode: the device will be awake and keep the antenna on. It will stay in real-time a predefined number of seconds (900).</li> <li>Normal mode: the device will be in sleep and only wake up according to the interval defined by the WAKE UP SET command.</li> </ul>
1212
]]></description>
1313
<category>Sensor</category>
1414

@@ -40,7 +40,6 @@ NorthQ Q-Gas 9121 (Firmware v3, 2016)<br /><h1>Overview</h1><p>The Power Reader
4040
<property name="manufacturerId">0096</property>
4141
<property name="manufacturerRef">0010:0001</property>
4242
<property name="versionMin">3.0</property>
43-
<property name="versionMax">3.34</property>
4443
<property name="dbReference">561</property>
4544
</properties>
4645

@@ -56,7 +55,7 @@ NorthQ Q-Gas 9121 (Firmware v3, 2016)<br /><h1>Overview</h1><p>The Power Reader
5655
<!-- PARAMETER DEFINITIONS -->
5756
<parameter name="config_1_4" type="integer" groupName="configuration"
5857
min="0" max="1000000">
59-
<label>1: 1: Pulse factor</label>
58+
<label>1: Pulse factor</label>
6059
<description><![CDATA[
6160
Impulse or Rotation factor (see NorthQ docs for Gas meters)<br /><h1>Overview</h1><p>Register 1 - Pulse factor (4 byte register) - In this register the controlling node must set the meter's impulse or rotation factor x 10.</p> <p>Example: For a gas meter read using the silver spot on one of the digits, the value written in this register is calculated with the following formula: Pulse factor = 10^?, where X is the index of the digit that has the silver spot.</p> <p>For a gas meter read through magnetic contact, the impulse factor is usually expressed as 1 imp = 0.01 m3, which correlates to 100 impulses for 1 m3. The value written in this register will therefore be 1000 (100*10).</p>
6261
]]></description>
@@ -66,7 +65,7 @@ Impulse or Rotation factor (see NorthQ docs for Gas meters)<br /><h1>Overview</h
6665
</parameter>
6766

6867
<parameter name="config_2_1" type="integer" groupName="configuration">
69-
<label>2: 2: Sensor type</label>
68+
<label>2: Sensor type</label>
7069
<description><![CDATA[
7170
Defines the type of sensor<br /><h1>Overview</h1><p>Register 2 - sensor type (1 byte register) - In this register, the controlling node has to set the meter type on which the Power Reader is placed.</p> <p>For gas firmware: set 0x01 to this register for magnetic contact meters, or 0x02 for silver spot meters.</p>
7271
]]></description>
@@ -80,9 +79,9 @@ Defines the type of sensor<br /><h1>Overview</h1><p>Register 2 - sensor type (1
8079

8180
<parameter name="config_9_4" type="integer" groupName="configuration"
8281
min="0" max="2147483647">
83-
<label>9: 9: Pulse count</label>
82+
<label>9: Pulse count</label>
8483
<description><![CDATA[
85-
This register holds the total number of pulses. Use this register to set the total meter consumption. In order for the Power/Gas Reader to report the proper total meter consumption, the value for this registered has to be initialized w<br /><h1>Overview</h1><p>Register 9 - pulse count (4 byte register) - This register holds the total number of pulses. Use this register to set the total meter consumption. In order for the Power/Gas Reader to report the proper total meter consumption, the value for this registered has to be initialized with meter value * impulse factor.</p> <p>Ex: For a mechanical meter with a rotation factor of 150 and the total meter consumption 100.3, the value written in this register must be: 15045 (150 x 100.3). The total meter consumption written on the meter can be a user input variable at installation.</p>
84+
This register holds the total number of pulses.<br /><h1>Overview</h1><p>Register 9 - pulse count (4 byte register) - This register holds the total number of pulses. Use this register to set the total meter consumption. In order for the Power/Gas Reader to report the proper total meter consumption, the value for this registered has to be initialized with meter value * impulse factor.</p> <p>Ex: For a mechanical meter with a rotation factor of 150 and the total meter consumption 100.3, the value written in this register must be: 15045 (150 x 100.3). The total meter consumption written on the meter can be a user input variable at installation.</p>
8685
]]></description>
8786
<default>0</default>
8887
<advanced>true</advanced>
@@ -91,7 +90,7 @@ This register holds the total number of pulses. Use this register to set the tot
9190

9291
<parameter name="config_10_2" type="integer" groupName="configuration"
9392
min="0" max="32767">
94-
<label>10: 10: Keep alive period</label>
93+
<label>10: Keep alive period</label>
9594
<description><![CDATA[
9695
How many ticks before going back to sleep in normal wakeup mode.<br /><h1>Overview</h1><p>Register 10 - keep alive period (2 byte register) - At every wake up notification, the Power Reader stays alive for 3 seconds. If the controlling node can't guarantee a response for the Power Reader within 3 seconds, then this register should be set to the number of seconds that it will take the controlling node to send a response / request to the wake up notification.</p>
9796
]]></description>
@@ -100,11 +99,11 @@ How many ticks before going back to sleep in normal wakeup mode.<br /><h1>Overvi
10099
<limitToOptions>false</limitToOptions>
101100
</parameter>
102101

103-
<parameter name="config_11_2" type="integer" groupName="configuration"
102+
<parameter name="config_11_2" type="integer" groupName="configuration" readOnly="true"
104103
min="0" max="32767">
105-
<label>11: 11: Real-time mode</label>
104+
<label>11: Real-time mode</label>
106105
<description><![CDATA[
107-
Set this to enter real-time mode from remote. Contains seconds * poll frequency before going back to sleep. If you press the button once this value will be set.<br /><h1>Overview</h1><p>Register 11 - real-time register (2 bytes) - This register notifies the controlling mode when the real-time mode has started and when it ended. The configuration report contains the number of seconds * 20 left until the real-time mode is over. A configuration report with value 0 notifies the controlling node that the Power Reader is going to normal mode.</p> <p>NOTE: The wake up no more information has no effect in real-time mode. In order to tell the Power Reader to go to sleep from real-time mode, the controlling node has to set this register to value 0.</p>
106+
Set this to enter real-time mode from remote.<br /><h1>Overview</h1><p>Register 11 - real-time register (2 bytes) - This register notifies the controlling mode when the real-time mode has started and when it ended. The configuration report contains the number of seconds * 20 left until the real-time mode is over. A configuration report with value 0 notifies the controlling node that the Power Reader is going to normal mode.</p> <p>NOTE: The wake up no more information has no effect in real-time mode. In order to tell the Power Reader to go to sleep from real-time mode, the controlling node has to set this register to value 0.</p>
108107
]]></description>
109108
<default>0</default>
110109
<advanced>true</advanced>
@@ -113,7 +112,7 @@ Set this to enter real-time mode from remote. Contains seconds * poll frequency
113112

114113
<parameter name="config_12_4" type="integer" groupName="configuration" readOnly="true"
115114
min="0" max="65535">
116-
<label>12: 12: Serial number</label>
115+
<label>12: Serial number</label>
117116
<description><![CDATA[
118117
Read-only serial number in decimal<br /><h1>Overview</h1><p>Register 12 - serial number (4 bytes) - This register contains the serial number of the Power Reader. </p> <p>NOTE: The serial numbers written on the Power Reader are in HEX, not decimal.</p>
119118
]]></description>
@@ -123,9 +122,9 @@ Read-only serial number in decimal<br /><h1>Overview</h1><p>Register 12 - serial
123122

124123
<parameter name="config_15_4" type="integer" groupName="configuration"
125124
min="0" max="65535">
126-
<label>15: 15: Calibration status</label>
125+
<label>15: Calibration status</label>
127126
<description><![CDATA[
128-
Only applies to gas readers with firmware version 3.30 or higher configured for SILVER SPOT!<br /><h1>Overview</h1><p>Register 15 - calibration status (4 byte) - A configuration report with this register will inform the controlling node of its current calibration status on the meter.</p> <p><strong>Only applies to gas readers with firmware version 3.30 or higher configured for SILVER SPOT!</strong></p> <p>Setting the value 0 on this register will restart the calibration process will restart the calibration process that occurs normally at power-up. The calibration process lasts approx. 2 minutes. Interrogating this register will return the current calibration percentage, from 0 to 100, value 100 indicating that the calibration has ended.</p>
127+
Aplies to devices with firmware version 3.30 or higher<br /><h1>Overview</h1><p>Register 15 - calibration status (4 byte) - A configuration report with this register will inform the controlling node of its current calibration status on the meter.</p> <p><strong>Only applies to gas readers with firmware version 3.30 or higher configured for SILVER SPOT!</strong></p> <p>Setting the value 0 on this register will restart the calibration process will restart the calibration process that occurs normally at power-up. The calibration process lasts approx. 2 minutes. Interrogating this register will return the current calibration percentage, from 0 to 100, value 100 indicating that the calibration has ended.</p>
129128
]]></description>
130129
<default>0</default>
131130
<advanced>true</advanced>

0 commit comments

Comments
 (0)