iobroker.zigbee 1.5.5 → 1.6.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/FUNDING.yml +1 -1
- package/.github/workflows/test-and-release.yml +10 -10
- package/LICENSE +1 -1
- package/README.md +40 -8
- package/admin/adapter-settings.js +39 -3
- package/admin/admin.js +23 -33
- package/admin/img/tuya_rb280.png +0 -0
- package/admin/index_m.html +84 -37
- package/admin/tab_m.html +95 -35
- package/admin/words.js +24 -24
- package/docs/tutorial/adm5_1.PNG +0 -0
- package/docs/tutorial/adm5_2.PNG +0 -0
- package/docs/tutorial/zigbee.png +0 -0
- package/io-package.json +27 -3
- package/lib/commands.js +2 -1
- package/lib/devices.js +10 -14
- package/lib/exposes.js +263 -104
- package/lib/states.js +86 -27
- package/lib/statescontroller.js +10 -2
- package/lib/utils.js +19 -0
- package/lib/zbBaseExtension.js +4 -0
- package/lib/zbDelayedAction.js +5 -0
- package/lib/zbDeviceAvailability.js +2 -0
- package/lib/zbDeviceConfigure.js +8 -5
- package/lib/zigbeecontroller.js +79 -31
- package/main.js +118 -43
- package/package.json +7 -6
package/io-package.json
CHANGED
|
@@ -1,9 +1,24 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "zigbee",
|
|
4
|
-
"version": "1.
|
|
4
|
+
"version": "1.6.6",
|
|
5
5
|
"news": {
|
|
6
|
-
"1.
|
|
6
|
+
"1.6.6": {
|
|
7
|
+
"en": "fix admin"
|
|
8
|
+
},
|
|
9
|
+
"1.6.5": {
|
|
10
|
+
"en": "Some fixes and updates"
|
|
11
|
+
},
|
|
12
|
+
"1.6.3": {
|
|
13
|
+
"en": "Some fixes and updates"
|
|
14
|
+
},
|
|
15
|
+
"1.6.2": {
|
|
16
|
+
"en": "Some fixes and updates"
|
|
17
|
+
},
|
|
18
|
+
"1.6.0": {
|
|
19
|
+
"en": "Improvements and new devices"
|
|
20
|
+
},
|
|
21
|
+
"1.5.6": {
|
|
7
22
|
"en": "Dashboard"
|
|
8
23
|
},
|
|
9
24
|
"1.4.1": {
|
|
@@ -167,6 +182,9 @@
|
|
|
167
182
|
"dataFolder": "zigbee_%INSTANCE%",
|
|
168
183
|
"compact": true,
|
|
169
184
|
"materializeTab": true,
|
|
185
|
+
"connectionType": "local",
|
|
186
|
+
"dataSource": "push",
|
|
187
|
+
"tier": 2,
|
|
170
188
|
"adminTab": {
|
|
171
189
|
"name": {
|
|
172
190
|
"en": "Zigbee",
|
|
@@ -181,6 +199,11 @@
|
|
|
181
199
|
"zh-cn": "Zigbee"
|
|
182
200
|
},
|
|
183
201
|
"fa-icon": "</i><img style='width:24px;margin-bottom:-6px;' src='/adapter/zigbee/zigbee.svg'><i>"
|
|
202
|
+
},
|
|
203
|
+
"plugins": {
|
|
204
|
+
"sentry": {
|
|
205
|
+
"dsn": "https://c829e2ad996d45d1bdb2247805699883@o831057.ingest.sentry.io/5812498"
|
|
206
|
+
}
|
|
184
207
|
}
|
|
185
208
|
},
|
|
186
209
|
"native": {
|
|
@@ -194,7 +217,8 @@
|
|
|
194
217
|
"adapterType": "zstack",
|
|
195
218
|
"debugHerdsman": false,
|
|
196
219
|
"disablePing": false,
|
|
197
|
-
"external": ""
|
|
220
|
+
"external": "",
|
|
221
|
+
"startWithInconsistent": false
|
|
198
222
|
},
|
|
199
223
|
"instanceObjects": [
|
|
200
224
|
{
|
package/lib/commands.js
CHANGED
|
@@ -4,7 +4,8 @@ const getZbId = require('./utils').getZbId;
|
|
|
4
4
|
const statesMapping = require('./devices');
|
|
5
5
|
const disallowedDashStates = [
|
|
6
6
|
'link_quality', 'available', 'battery', 'groups', 'device_query',
|
|
7
|
-
'hue_move', 'color_temp_move', 'satuation_move', 'brightness_move', 'brightness_step', 'hue_calibration'
|
|
7
|
+
'hue_move', 'color_temp_move', 'satuation_move', 'brightness_move', 'brightness_step', 'hue_calibration',
|
|
8
|
+
'msg_from_zigbee',
|
|
8
9
|
];
|
|
9
10
|
|
|
10
11
|
class Commands {
|
package/lib/devices.js
CHANGED
|
@@ -722,7 +722,7 @@ const devices = [
|
|
|
722
722
|
{
|
|
723
723
|
models: ['RTCGQ11LM'],
|
|
724
724
|
icon: 'img/aqara_numan_body_sensor.png',
|
|
725
|
-
states: [states.occupancy, states.no_motion, states.illuminance, states.voltage, states.battery, states.occupancy_timeout],
|
|
725
|
+
states: [states.temperature, states.occupancy, states.no_motion, states.illuminance, states.voltage, states.battery, states.occupancy_timeout],
|
|
726
726
|
},
|
|
727
727
|
{
|
|
728
728
|
models: ['MCCGQ01LM'],
|
|
@@ -764,11 +764,6 @@ const devices = [
|
|
|
764
764
|
icon: 'img/plug.png',
|
|
765
765
|
states: [states.state, states.load_power, states.plug_voltage, states.plug_consumption, states.plug_temperature],
|
|
766
766
|
},
|
|
767
|
-
{
|
|
768
|
-
models: ['LLKZMK11LM'],
|
|
769
|
-
icon: 'img/lumi.relay.c2acn01.png',
|
|
770
|
-
states: [states.state, states.load_power, states.plug_voltage, states.plug_consumption],
|
|
771
|
-
},
|
|
772
767
|
{
|
|
773
768
|
models: ['QBCZ11LM'],
|
|
774
769
|
icon: 'img/86plug.png',
|
|
@@ -822,12 +817,13 @@ const devices = [
|
|
|
822
817
|
models: ['LLKZMK11LM'],
|
|
823
818
|
icon: 'img/lumi_relay.png',
|
|
824
819
|
states: [states.channel1_state, states.channel2_state, states.load_power,
|
|
825
|
-
states.temperature, states.interlock],
|
|
820
|
+
states.temperature, states.interlock, states.plug_consumption],
|
|
826
821
|
},
|
|
827
822
|
{
|
|
828
823
|
models: ['ZNCLDJ11LM'],
|
|
829
824
|
icon: 'img/aqara_curtain.png',
|
|
830
|
-
states: [states.curtain_position, states.curtain_running, states.curtain_stop
|
|
825
|
+
states: [states.curtain_position, states.curtain_running, states.curtain_stop, states.curtain_xiaomi_reverse_direction,
|
|
826
|
+
states.curtain_xiaomi_reset_limits, states.curtain_xiaomi_hand_open],
|
|
831
827
|
},
|
|
832
828
|
{
|
|
833
829
|
models: ['WXCJKG11LM'],
|
|
@@ -2320,12 +2316,6 @@ const devices = [
|
|
|
2320
2316
|
linkedStates: [comb.brightnessAndState],
|
|
2321
2317
|
},
|
|
2322
2318
|
// Nue / 3A
|
|
2323
|
-
{
|
|
2324
|
-
models: ['HGZB-42-UK / HGZB-41 / HGZB-41-UK'],
|
|
2325
|
-
icon: 'img/fnb56zsw01.png',
|
|
2326
|
-
states: lightStates,
|
|
2327
|
-
linkedStates: [comb.brightnessAndState],
|
|
2328
|
-
},
|
|
2329
2319
|
{
|
|
2330
2320
|
models: ['XY12S-15'],
|
|
2331
2321
|
icon: 'img/fnb56zsw01.png',
|
|
@@ -2335,6 +2325,11 @@ const devices = [
|
|
|
2335
2325
|
{
|
|
2336
2326
|
models: ['HGZB-42-UK / HGZB-41 / HGZB-41-UK', 'HGZB-02A'],
|
|
2337
2327
|
icon: 'img/nue_hgzb-02a.png',
|
|
2328
|
+
states: [states.state],
|
|
2329
|
+
},
|
|
2330
|
+
{
|
|
2331
|
+
models: ['HGZB-02A'],
|
|
2332
|
+
icon: 'img/nue_hgzb-02a.png',
|
|
2338
2333
|
states: lightStates,
|
|
2339
2334
|
linkedStates: [comb.brightnessAndState],
|
|
2340
2335
|
},
|
|
@@ -3054,6 +3049,7 @@ const commonStates = [
|
|
|
3054
3049
|
states.link_quality,
|
|
3055
3050
|
states.available,
|
|
3056
3051
|
states.device_query,
|
|
3052
|
+
states.from_zigbee,
|
|
3057
3053
|
];
|
|
3058
3054
|
|
|
3059
3055
|
const groupStates = [states.brightness_step].concat(lightStatesWithColor);
|