iobroker.zigbee 1.6.18 → 1.7.2
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/README.md +73 -60
- package/admin/admin.js +2 -2
- package/admin/img/philips_ensis.png +0 -0
- package/admin/index_m.html +7 -7
- package/admin/vis-network.min.css +1 -1
- package/admin/vis-network.min.js +7 -6
- package/admin/words.js +8 -5
- package/io-package.json +92 -122
- package/lib/backup.js +62 -24
- package/lib/exposes.js +4 -2
- package/lib/statescontroller.js +42 -4
- package/lib/zbDeviceAvailability.js +0 -6
- package/main.js +2 -29
- package/package.json +77 -77
package/main.js
CHANGED
|
@@ -199,7 +199,6 @@ class Zigbee extends utils.Adapter {
|
|
|
199
199
|
this.zbController.on('event', this.onZigbeeEvent.bind(this));
|
|
200
200
|
this.zbController.on('msg', this.onZigbeeEvent.bind(this));
|
|
201
201
|
this.zbController.on('publish', this.publishToState.bind(this));
|
|
202
|
-
this.zbController.on('deviceStatusUpdate', this.onDeviceStatusUpdate.bind(this));
|
|
203
202
|
this.zbController.configure(zigbeeOptions);
|
|
204
203
|
await this.callPluginMethod('configure', [zigbeeOptions]);
|
|
205
204
|
|
|
@@ -757,34 +756,7 @@ class Zigbee extends utils.Adapter {
|
|
|
757
756
|
}
|
|
758
757
|
}
|
|
759
758
|
}
|
|
760
|
-
|
|
761
|
-
if (!deviceId) return;
|
|
762
|
-
|
|
763
|
-
this.log.debug(`onDeviceStatusUpdate: ${deviceId}: ${status}`);
|
|
764
|
-
|
|
765
|
-
if (_pairingMode) return;
|
|
766
|
-
|
|
767
|
-
try {
|
|
768
|
-
let colorIeee = '#46a100ff';
|
|
769
|
-
|
|
770
|
-
if (!status) {
|
|
771
|
-
colorIeee = '#ff0400ff'; // dev is offline
|
|
772
|
-
}
|
|
773
|
-
|
|
774
|
-
if (!this.config.colorize) {
|
|
775
|
-
colorIeee = null;
|
|
776
|
-
}
|
|
777
|
-
|
|
778
|
-
await this.extendObjectAsync(deviceId, {
|
|
779
|
-
common: {
|
|
780
|
-
color: colorIeee
|
|
781
|
-
}
|
|
782
|
-
});
|
|
783
|
-
} catch (e) {
|
|
784
|
-
this.log.error(e.toString());
|
|
785
|
-
}
|
|
786
|
-
}
|
|
787
|
-
|
|
759
|
+
|
|
788
760
|
/**
|
|
789
761
|
* @param {() => void} callback
|
|
790
762
|
*/
|
|
@@ -856,6 +828,7 @@ class Zigbee extends utils.Adapter {
|
|
|
856
828
|
disableLed: this.config.disableLed,
|
|
857
829
|
disablePing: this.config.disablePing,
|
|
858
830
|
transmitPower: this.config.transmitPower,
|
|
831
|
+
disableBackup: this.config.disableBackup,
|
|
859
832
|
extPanIdFix: extPanIdFix,
|
|
860
833
|
startWithInconsistent: this.config.startWithInconsistent || false,
|
|
861
834
|
};
|
package/package.json
CHANGED
|
@@ -1,77 +1,77 @@
|
|
|
1
|
-
{
|
|
2
|
-
"name": "iobroker.zigbee",
|
|
3
|
-
"version": "1.
|
|
4
|
-
"author": {
|
|
5
|
-
"name": "Kirov Ilya",
|
|
6
|
-
"email": "kirovilya@gmail.com"
|
|
7
|
-
},
|
|
8
|
-
"bugs": {
|
|
9
|
-
"url": "https://github.com/ioBroker/ioBroker.zigbee/issues"
|
|
10
|
-
},
|
|
11
|
-
"contributors": [
|
|
12
|
-
{
|
|
13
|
-
"name": "Kirov Ilya",
|
|
14
|
-
"email": "kirovilya@gmail.com"
|
|
15
|
-
}
|
|
16
|
-
],
|
|
17
|
-
"engines": {
|
|
18
|
-
"node": ">=10"
|
|
19
|
-
},
|
|
20
|
-
"dependencies": {
|
|
21
|
-
"zigbee-herdsman": "0.14.
|
|
22
|
-
"zigbee-herdsman-converters": "14.0.
|
|
23
|
-
"@iobroker/adapter-core": "^2.4.0",
|
|
24
|
-
"tar": "^6.0.5",
|
|
25
|
-
"typescript": "^4.0.5"
|
|
26
|
-
},
|
|
27
|
-
"description": "Zigbee devices",
|
|
28
|
-
"devDependencies": {
|
|
29
|
-
"@alcalzone/release-script": "~3.4.2",
|
|
30
|
-
"@iobroker/testing": "^2.5.4",
|
|
31
|
-
"axios": "^0.21.1",
|
|
32
|
-
"mixin-deep": "^1.3.2",
|
|
33
|
-
"eslint": "^7.18.0",
|
|
34
|
-
"eslint-config-google": "*",
|
|
35
|
-
"lint-diff": "*",
|
|
36
|
-
"chai": "^4.3.4",
|
|
37
|
-
"chai-as-promised": "^7.1.1",
|
|
38
|
-
"gulp": "^4.0.2",
|
|
39
|
-
"gulp-jsdoc3": "^3.0.0",
|
|
40
|
-
"gulp-replace": "^1.1.3",
|
|
41
|
-
"mocha": "^9.1.3"
|
|
42
|
-
},
|
|
43
|
-
"homepage": "https://github.com/ioBroker/ioBroker.zigbee",
|
|
44
|
-
"keywords": [
|
|
45
|
-
"ioBroker",
|
|
46
|
-
"zigbee",
|
|
47
|
-
"cc2531",
|
|
48
|
-
"cc2530",
|
|
49
|
-
"cc2538",
|
|
50
|
-
"cc2652",
|
|
51
|
-
"deconz",
|
|
52
|
-
"conbee",
|
|
53
|
-
"raspbee",
|
|
54
|
-
"ezsp",
|
|
55
|
-
"efr32"
|
|
56
|
-
],
|
|
57
|
-
"license": "MIT",
|
|
58
|
-
"main": "main.js",
|
|
59
|
-
"optionalDependencies": {},
|
|
60
|
-
"readmeFilename": "README.md",
|
|
61
|
-
"repository": {
|
|
62
|
-
"type": "git",
|
|
63
|
-
"url": "git+https://github.com/ioBroker/ioBroker.zigbee.git"
|
|
64
|
-
},
|
|
65
|
-
"scripts": {
|
|
66
|
-
"test": "npm run test:package && npm run test:unit",
|
|
67
|
-
"docgen": "node support/docgen.js",
|
|
68
|
-
"test:package": "mocha test/package --exit",
|
|
69
|
-
"test:unit": "mocha test/unit --exit",
|
|
70
|
-
"test:integration": "mocha test/integration --exit",
|
|
71
|
-
"watch:parcel": "parcel admin/src/index.tsx -d admin/build --hmr-port 1235",
|
|
72
|
-
"test:js": "mocha --opts test/mocha.custom.opts",
|
|
73
|
-
"lint": "npm run lint:js",
|
|
74
|
-
"lint:js": "eslint",
|
|
75
|
-
"release": "release-script"
|
|
76
|
-
}
|
|
77
|
-
}
|
|
1
|
+
{
|
|
2
|
+
"name": "iobroker.zigbee",
|
|
3
|
+
"version": "1.7.2",
|
|
4
|
+
"author": {
|
|
5
|
+
"name": "Kirov Ilya",
|
|
6
|
+
"email": "kirovilya@gmail.com"
|
|
7
|
+
},
|
|
8
|
+
"bugs": {
|
|
9
|
+
"url": "https://github.com/ioBroker/ioBroker.zigbee/issues"
|
|
10
|
+
},
|
|
11
|
+
"contributors": [
|
|
12
|
+
{
|
|
13
|
+
"name": "Kirov Ilya",
|
|
14
|
+
"email": "kirovilya@gmail.com"
|
|
15
|
+
}
|
|
16
|
+
],
|
|
17
|
+
"engines": {
|
|
18
|
+
"node": ">=10"
|
|
19
|
+
},
|
|
20
|
+
"dependencies": {
|
|
21
|
+
"zigbee-herdsman": "0.14.33",
|
|
22
|
+
"zigbee-herdsman-converters": "14.0.528",
|
|
23
|
+
"@iobroker/adapter-core": "^2.4.0",
|
|
24
|
+
"tar": "^6.0.5",
|
|
25
|
+
"typescript": "^4.0.5"
|
|
26
|
+
},
|
|
27
|
+
"description": "Zigbee devices",
|
|
28
|
+
"devDependencies": {
|
|
29
|
+
"@alcalzone/release-script": "~3.4.2",
|
|
30
|
+
"@iobroker/testing": "^2.5.4",
|
|
31
|
+
"axios": "^0.21.1",
|
|
32
|
+
"mixin-deep": "^1.3.2",
|
|
33
|
+
"eslint": "^7.18.0",
|
|
34
|
+
"eslint-config-google": "*",
|
|
35
|
+
"lint-diff": "*",
|
|
36
|
+
"chai": "^4.3.4",
|
|
37
|
+
"chai-as-promised": "^7.1.1",
|
|
38
|
+
"gulp": "^4.0.2",
|
|
39
|
+
"gulp-jsdoc3": "^3.0.0",
|
|
40
|
+
"gulp-replace": "^1.1.3",
|
|
41
|
+
"mocha": "^9.1.3"
|
|
42
|
+
},
|
|
43
|
+
"homepage": "https://github.com/ioBroker/ioBroker.zigbee",
|
|
44
|
+
"keywords": [
|
|
45
|
+
"ioBroker",
|
|
46
|
+
"zigbee",
|
|
47
|
+
"cc2531",
|
|
48
|
+
"cc2530",
|
|
49
|
+
"cc2538",
|
|
50
|
+
"cc2652",
|
|
51
|
+
"deconz",
|
|
52
|
+
"conbee",
|
|
53
|
+
"raspbee",
|
|
54
|
+
"ezsp",
|
|
55
|
+
"efr32"
|
|
56
|
+
],
|
|
57
|
+
"license": "MIT",
|
|
58
|
+
"main": "main.js",
|
|
59
|
+
"optionalDependencies": {},
|
|
60
|
+
"readmeFilename": "README.md",
|
|
61
|
+
"repository": {
|
|
62
|
+
"type": "git",
|
|
63
|
+
"url": "git+https://github.com/ioBroker/ioBroker.zigbee.git"
|
|
64
|
+
},
|
|
65
|
+
"scripts": {
|
|
66
|
+
"test": "npm run test:package && npm run test:unit",
|
|
67
|
+
"docgen": "node support/docgen.js",
|
|
68
|
+
"test:package": "mocha test/package --exit",
|
|
69
|
+
"test:unit": "mocha test/unit --exit",
|
|
70
|
+
"test:integration": "mocha test/integration --exit",
|
|
71
|
+
"watch:parcel": "parcel admin/src/index.tsx -d admin/build --hmr-port 1235",
|
|
72
|
+
"test:js": "mocha --opts test/mocha.custom.opts",
|
|
73
|
+
"lint": "npm run lint:js",
|
|
74
|
+
"lint:js": "eslint",
|
|
75
|
+
"release": "release-script"
|
|
76
|
+
}
|
|
77
|
+
}
|