dandri/zigbee2mqtt
1
0
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2026-08-23 11:09:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix extendedPanID parameter name (#2283)

Browse Source 
* Fix extendedPanID parameter name

* Update herdsman and fix tests.
This commit is contained in:
Tim Kent
2019-11-06 19:43:12 +01:00
committed by Koen Kanters
parent 00bc4de943
commit 45c6f2345c
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zigbee.js
+1 -1
View File
@@ -14,7 +14,7 @@ const keyEndpointByNumber = new RegExp(`.*/([0-9].*)$`);
const herdsmanSettings = {
network: {
panID: settings.get().advanced.pan_id,
extenedPanID: settings.get().advanced.ext_pan_id,
extendedPanID: settings.get().advanced.ext_pan_id,
channelList: [settings.get().advanced.channel],
networkKey: settings.get().advanced.network_key,
},
npm-shrinkwrap.json
Generated
+9 -9
View File
@@ -1161,9 +1161,9 @@
}
},
"convert-source-map": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
"integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
"integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
"dev": true,
"requires": {
"safe-buffer": "~5.1.1"
@@ -5719,9 +5719,9 @@
"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
},
"uglify-js": {
"version": "3.6.7",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.7.tgz",
"integrity": "sha512-4sXQDzmdnoXiO+xvmTzQsfIiwrjUCSA95rSP4SEd8tDb51W2TiDOlL76Hl+Kw0Ie42PSItCW8/t6pBNCF2R48A==",
"version": "3.6.8",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.8.tgz",
"integrity": "sha512-XhHJ3S3ZyMwP8kY1Gkugqx3CJh2C3O0y8NPiSxtm1tyD/pktLAkFZsFGpuNfTZddKDQ/bbDBLAd2YyA1pbi8HQ==",
"dev": true,
"optional": true,
"requires": {
@@ -6131,9 +6131,9 @@
}
},
"zigbee-herdsman": {
"version": "0.11.7",
"resolved": "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.11.7.tgz",
"integrity": "sha512-k4Au3RZ9kc4Q6uTqtbkvnVA+lwdtB8osF9zsHo0ALRtjJzN16RAzL68Q7fRqtIBU7TFJxOmKUPIwbqbhLmEUgQ==",
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.12.0.tgz",
"integrity": "sha512-y8EsYgSEDeTxafgXSsiQspjCC8ACatI6KeVsz8+0L8VNllL1RPSY051JbfxhUVsPCebJBEv6vUnPx7bkpCs41w==",
"requires": {
"debug": "^4.1.1",
"fast-deep-equal": "^2.0.1",
package.json
+1 -1
View File
@@ -45,7 +45,7 @@
"rimraf": "*",
"semver": "*",
"winston": "*",
"zigbee-herdsman": "0.11.7",
"zigbee-herdsman": "0.12.0",
"zigbee-herdsman-converters": "11.1.38"
},
"devDependencies": {
test/controller.test.js
+1 -1
View File
@@ -31,7 +31,7 @@ describe('Controller', () => {
it('Start controller', async () => {
await controller.start();
expect(logger.cleanup).toHaveBeenCalledTimes(1);
expect(zigbeeHerdsman.constructor).toHaveBeenCalledWith({"network":{"panID":6754,"extenedPanID":[221,221,221,221,221,221,221,221],"channelList":[11],"networkKey":[1,3,5,7,9,11,13,15,0,2,4,6,8,10,12,13]},"databasePath":path.join(data.mockDir, "database.db"), "databaseBackupPath":path.join(data.mockDir, "database.db.backup"),"backupPath":path.join(data.mockDir, "coordinator_backup.json"),"acceptJoiningDeviceHandler": expect.any(Function),"serialPort":{"baudRate":115200,"rtscts":true,"path":"/dev/dummy"}});
expect(zigbeeHerdsman.constructor).toHaveBeenCalledWith({"network":{"panID":6754,"extendedPanID":[221,221,221,221,221,221,221,221],"channelList":[11],"networkKey":[1,3,5,7,9,11,13,15,0,2,4,6,8,10,12,13]},"databasePath":path.join(data.mockDir, "database.db"), "databaseBackupPath":path.join(data.mockDir, "database.db.backup"),"backupPath":path.join(data.mockDir, "coordinator_backup.json"),"acceptJoiningDeviceHandler": expect.any(Function),"serialPort":{"baudRate":115200,"rtscts":true,"path":"/dev/dummy"}});
expect(zigbeeHerdsman.start).toHaveBeenCalledTimes(1);
expect(zigbeeHerdsman.setLED).toHaveBeenCalledTimes(0);
expect(zigbeeHerdsman.permitJoin).toHaveBeenCalledTimes(1);