Skip to content

Commit 87ecd34

Browse files
cdjacksoncdjackson
authored
Database update (openhab#1169)
Signed-off-by: Chris Jackson <[email protected]>
1 parent ea6a2c2 commit 87ecd34

File tree

14 files changed

+304
-231
lines changed

14 files changed

+304
-231
lines changed

‎doc/aeon/zw095_0_0.md

+41-56
Original file line numberDiff line numberDiff line change
@@ -53,127 +53,110 @@ Removing your meter from a Z-Wave network. Your Home Energy Meter (HEM) can be r
5353

5454
The following table summarises the channels available for the ZW095 -:
5555

56-
| Channel | Channel Id | Category | Item Type |
57-
|---------|------------|----------|-----------|
58-
| Electric meter (amps) | meter_current | Energy | Number |
59-
| Electric meter (watts) | meter_watts | Energy | Number |
60-
| Electric meter (kWh) | meter_kwh | Energy | Number |
61-
| Electric meter (volts) | meter_voltage | Energy | Number |
62-
| Reset Meter | meter_reset | Energy | Switch |
63-
| Electric meter (amps) 1 | meter_current1 | Energy | Number |
64-
| Electric meter (watts) 1 | meter_watts1 | Energy | Number |
65-
| Electric meter (kWh) 1 | meter_kwh1 | Energy | Number |
66-
| Electric meter (volts) 1 | meter_voltage1 | Energy | Number |
67-
| Electric meter (amps) 2 | meter_current2 | Energy | Number |
68-
| Electric meter (watts) 2 | meter_watts2 | Energy | Number |
69-
| Electric meter (kWh) 2 | meter_kwh2 | Energy | Number |
70-
| Electric meter (volts) 2 | meter_voltage2 | Energy | Number |
71-
| Electric meter (amps) 3 | meter_current3 | Energy | Number |
72-
| Electric meter (watts) 3 | meter_watts3 | Energy | Number |
73-
| Electric meter (kWh) 3 | meter_kwh3 | Energy | Number |
74-
| Electric meter (volts) 3 | meter_voltage3 | Energy | Number |
56+
| Channel Name | Channel ID | Channel Type | Category | Item Type |
57+
|--------------|------------|--------------|----------|-----------|
58+
| Electric meter (amps) | meter_current | meter_current | Energy | Number |
59+
| Electric meter (watts) | meter_watts | meter_watts | Energy | Number |
60+
| Electric meter (kWh) | meter_kwh | meter_kwh | Energy | Number |
61+
| Electric meter (volts) | meter_voltage | meter_voltage | Energy | Number |
62+
| Reset Meter | meter_reset | meter_reset | Energy | Switch |
63+
| Electric meter (amps) 1 | meter_current1 | meter_current | Energy | Number |
64+
| Electric meter (watts) 1 | meter_watts1 | meter_watts | Energy | Number |
65+
| Electric meter (kWh) 1 | meter_kwh1 | meter_kwh | Energy | Number |
66+
| Electric meter (volts) 1 | meter_voltage1 | meter_voltage | Energy | Number |
67+
| Electric meter (amps) 2 | meter_current2 | meter_current | Energy | Number |
68+
| Electric meter (watts) 2 | meter_watts2 | meter_watts | Energy | Number |
69+
| Electric meter (kWh) 2 | meter_kwh2 | meter_kwh | Energy | Number |
70+
| Electric meter (volts) 2 | meter_voltage2 | meter_voltage | Energy | Number |
71+
| Electric meter (amps) 3 | meter_current3 | meter_current | Energy | Number |
72+
| Electric meter (watts) 3 | meter_watts3 | meter_watts | Energy | Number |
73+
| Electric meter (kWh) 3 | meter_kwh3 | meter_kwh | Energy | Number |
74+
| Electric meter (volts) 3 | meter_voltage3 | meter_voltage | Energy | Number |
7575

7676
### Electric meter (amps)
77-
7877
Indicates the instantaneous current consumption.
7978

80-
The ```meter_current``` channel supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
79+
The ```meter_current``` channel and is of type ```meter_current``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
8180

8281
### Electric meter (watts)
83-
8482
Indicates the instantaneous power consumption.
8583

86-
The ```meter_watts``` channel supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
84+
The ```meter_watts``` channel and is of type ```meter_watts``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
8785

8886
### Electric meter (kWh)
89-
9087
Indicates the energy consumption (kWh).
9188

92-
The ```meter_kwh``` channel supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
89+
The ```meter_kwh``` channel and is of type ```meter_kwh``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
9390

9491
### Electric meter (volts)
95-
9692
Indicates the instantaneous voltage.
9793

98-
The ```meter_voltage``` channel supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
94+
The ```meter_voltage``` channel and is of type ```meter_voltage``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
9995

10096
### Reset Meter
101-
10297
Reset the meter.
10398

104-
The ```meter_reset``` channel supports the ```Switch``` item and is in the ```Energy``` category.
99+
The ```meter_reset``` channel and is of type ```meter_reset``` and supports the ```Switch``` item and is in the ```Energy``` category.
105100

106101
### Electric meter (amps) 1
107-
108102
Indicates the instantaneous current consumption.
109103

110-
The ```meter_current1``` channel supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
104+
The ```meter_current1``` channel and is of type ```meter_current``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
111105

112106
### Electric meter (watts) 1
113-
114107
Indicates the instantaneous power consumption.
115108

116-
The ```meter_watts1``` channel supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
109+
The ```meter_watts1``` channel and is of type ```meter_watts``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
117110

118111
### Electric meter (kWh) 1
119-
120112
Indicates the energy consumption (kWh).
121113

122-
The ```meter_kwh1``` channel supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
114+
The ```meter_kwh1``` channel and is of type ```meter_kwh``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
123115

124116
### Electric meter (volts) 1
125-
126117
Indicates the instantaneous voltage.
127118

128-
The ```meter_voltage1``` channel supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
119+
The ```meter_voltage1``` channel and is of type ```meter_voltage``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
129120

130121
### Electric meter (amps) 2
131-
132122
Indicates the instantaneous current consumption.
133123

134-
The ```meter_current2``` channel supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
124+
The ```meter_current2``` channel and is of type ```meter_current``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
135125

136126
### Electric meter (watts) 2
137-
138127
Indicates the instantaneous power consumption.
139128

140-
The ```meter_watts2``` channel supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
129+
The ```meter_watts2``` channel and is of type ```meter_watts``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
141130

142131
### Electric meter (kWh) 2
143-
144132
Indicates the energy consumption (kWh).
145133

146-
The ```meter_kwh2``` channel supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
134+
The ```meter_kwh2``` channel and is of type ```meter_kwh``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
147135

148136
### Electric meter (volts) 2
149-
150137
Indicates the instantaneous voltage.
151138

152-
The ```meter_voltage2``` channel supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
139+
The ```meter_voltage2``` channel and is of type ```meter_voltage``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
153140

154141
### Electric meter (amps) 3
155-
156142
Indicates the instantaneous current consumption.
157143

158-
The ```meter_current3``` channel supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
144+
The ```meter_current3``` channel and is of type ```meter_current``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
159145

160146
### Electric meter (watts) 3
161-
162147
Indicates the instantaneous power consumption.
163148

164-
The ```meter_watts3``` channel supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
149+
The ```meter_watts3``` channel and is of type ```meter_watts``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
165150

166151
### Electric meter (kWh) 3
167-
168152
Indicates the energy consumption (kWh).
169153

170-
The ```meter_kwh3``` channel supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
154+
The ```meter_kwh3``` channel and is of type ```meter_kwh``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
171155

172156
### Electric meter (volts) 3
173-
174157
Indicates the instantaneous voltage.
175158

176-
The ```meter_voltage3``` channel supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
159+
The ```meter_voltage3``` channel and is of type ```meter_voltage``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
177160

178161

179162

@@ -216,10 +199,12 @@ The following option values may be configured -:
216199

217200
| Value | Description |
218201
|--------|-------------|
219-
| 0 | Disabled |
220-
| 1 | Enabled |
202+
| 0 | Energy absolute value |
203+
| 1 | Algebraic sum energy |
204+
| 2 | Consuming electricity |
205+
| 3 | Generating electricity |
221206

222-
The manufacturer defined default value is ```0``` (Disabled).
207+
The manufacturer defined default value is ```0``` (Energy absolute value).
223208

224209
This parameter has the configuration ID ```config_2_1``` and is of type ```INTEGER```.
225210

‎doc/aeon/zw132_2_0.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ The following table summarises the channels available for the ZW132 -:
8080
| Electric meter (watts) | meter_watts | meter_watts | Energy | Number |
8181
| Electric meter (kWh) | meter_kwh | meter_kwh | Energy | Number |
8282
| Electric meter (amps) | meter_current | meter_current | Energy | Number |
83-
| Reset Meter [Deprecated]| meter_reset | meter_reset | Energy | Switch |
83+
| Reset Meter | meter_reset | meter_reset | Energy | Switch |
8484
| Alarm (power) | alarm_power | alarm_power | Energy | Switch |
8585
| Alarm (heat) | alarm_heat | alarm_heat | Fire | Switch |
8686
| Clock Time Offset | time_offset | time_offset | Temperature | Number |
@@ -125,13 +125,11 @@ Indicates the instantaneous current consumption.
125125

126126
The ```meter_current``` channel and is of type ```meter_current``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
127127

128-
### Reset Meter [Deprecated]
128+
### Reset Meter
129129
Reset the meter.
130130

131131
The ```meter_reset``` channel and is of type ```meter_reset``` and supports the ```Switch``` item and is in the ```Energy``` category.
132132

133-
**Note:** This channel is marked as deprecated so should not be used.
134-
135133
### Alarm (power)
136134
Indicates if a power alarm is triggered.
137135

‎doc/fibaro/fgr222_24_24.md

+21-19
Original file line numberDiff line numberDiff line change
@@ -49,56 +49,58 @@ Manual Z-Wave network inclusion: 
4949

5050
The following table summarises the channels available for the FGR222 -:
5151

52-
| Channel | Channel Id | Category | Item Type |
53-
|---------|------------|----------|-----------|
54-
| Switch | switch_binary | Switch | Switch |
55-
| Blinds Control | blinds_control | Blinds | Rollershutter |
56-
| Scene Number | scene_number | | Number |
57-
| Sensor (power) | sensor_power | Energy | Number |
58-
| Electric meter (watts) | meter_watts | Energy | Number |
59-
| Electric meter (kWh) | meter_kwh | Energy | Number |
60-
| Shutter position | blinds_shutter | Blinds | Dimmer |
61-
| Lamella position | blinds_lamella | Blinds | Dimmer |
52+
| Channel Name | Channel ID | Channel Type | Category | Item Type |
53+
|--------------|------------|--------------|----------|-----------|
54+
| Switch | switch_binary | switch_binary | Switch | Switch |
55+
| Blinds Control | blinds_control | blinds_control | Blinds | Rollershutter |
56+
| Scene Number | scene_number | scene_number | | Number |
57+
| Sensor (power) | sensor_power | sensor_power | Energy | Number |
58+
| Electric meter (watts) | meter_watts | meter_watts | Energy | Number |
59+
| Electric meter (kWh) | meter_kwh | meter_kwh | Energy | Number |
60+
| Shutter position [Deprecated]| blinds_shutter | blinds_shutter | Blinds | Dimmer |
61+
| Lamella position | blinds_lamella | blinds_lamella | Blinds | Dimmer |
6262

6363
### Switch
6464
Switch the power on and off.
6565

66-
The ```switch_binary``` channel supports the ```Switch``` item and is in the ```Switch``` category.
66+
The ```switch_binary``` channel and is of type ```switch_binary``` and supports the ```Switch``` item and is in the ```Switch``` category.
6767

6868
### Blinds Control
6969
Provides start / stop control of blinds.
7070

71-
The ```blinds_control``` channel supports the ```Rollershutter``` item and is in the ```Blinds``` category.
71+
The ```blinds_control``` channel and is of type ```blinds_control``` and supports the ```Rollershutter``` item and is in the ```Blinds``` category.
7272

7373
### Scene Number
7474
Triggers when a scene button is pressed.
7575

76-
The ```scene_number``` channel supports the ```Number``` item.
76+
The ```scene_number``` channel and is of type ```scene_number``` and supports the ```Number``` item.
7777

7878
### Sensor (power)
7979
Indicates the energy consumption (kWh).
8080

81-
The ```sensor_power``` channel supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
81+
The ```sensor_power``` channel and is of type ```sensor_power``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
8282

8383
### Electric meter (watts)
8484
Indicates the instantaneous power consumption.
8585

86-
The ```meter_watts``` channel supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
86+
The ```meter_watts``` channel and is of type ```meter_watts``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
8787

8888
### Electric meter (kWh)
8989
Indicates the energy consumption (kWh).
9090

91-
The ```meter_kwh``` channel supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
91+
The ```meter_kwh``` channel and is of type ```meter_kwh``` and supports the ```Number``` item and is in the ```Energy``` category. This is a read only channel so will only be updated following state changes from the device.
9292

93-
### Shutter position
93+
### Shutter position [Deprecated]
9494
Sets the blinds shutter position.
9595

96-
The ```blinds_shutter``` channel supports the ```Dimmer``` item and is in the ```Blinds``` category.
96+
The ```blinds_shutter``` channel and is of type ```blinds_shutter``` and supports the ```Dimmer``` item and is in the ```Blinds``` category.
97+
98+
**Note:** This channel is marked as deprecated so should not be used.
9799

98100
### Lamella position
99101
Sets the blinds lamella position.
100102

101-
The ```blinds_lamella``` channel supports the ```Dimmer``` item and is in the ```Blinds``` category.
103+
The ```blinds_lamella``` channel and is of type ```blinds_lamella``` and supports the ```Dimmer``` item and is in the ```Blinds``` category.
102104

103105

104106

0 commit comments

Comments
 (0)