dandri/zigbee2mqtt
1
0
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2026-07-02 10:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update herdsman and converters.

Browse Source
This commit is contained in:
Koen Kanters
2019-11-12 19:40:52 +01:00
parent e51ed89641
commit e33b49e2ff
5 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
npm-shrinkwrap.json
Generated
+6 -6
View File
@@ -6158,9 +6158,9 @@
}
},
"zigbee-herdsman": {
"version": "0.12.4",
"resolved": "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.12.4.tgz",
"integrity": "sha512-4YxAvEeiJsxamMQvY4t5+59ssFGg+ggZSJ4nUjkkRwJp3owDpdiRsKdZ6zdJzTwM3sHeSSuXyXR3CHAlah7juA==",
"version": "0.12.5",
"resolved": "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.12.5.tgz",
"integrity": "sha512-guUFauBHHHvCdmF7D8f4U21nk6RR8wfcerXCM6aCxHxfYyGrQczwNZ+o32cnvG/O8f/JQtGxBhLHPclYr1dlGQ==",
"requires": {
"debug": "^4.1.1",
"fast-deep-equal": "^2.0.1",
@@ -12664,9 +12664,9 @@
}
},
"zigbee-herdsman-converters": {
"version": "11.1.41",
"resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-11.1.41.tgz",
"integrity": "sha512-zNcpbpSOzVaLyWWApKOB+qkNeIzRY2bjTLRVULiX/InvFnY51VupxPF5bw+Ul3kXCZOXcDftBADxQ57WeTpSnQ=="
"version": "11.1.42",
"resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-11.1.42.tgz",
"integrity": "sha512-TtV7eg9Ao6teCQNO+I0td8Y/1iMBsL+1HgGtbBT8BrKsz/1ZmHRBBFLAUiIMU9FrrEj23jl0PO7RpOxIWwrZ8A=="
}
}
}
package.json
+2 -2
View File
@@ -45,8 +45,8 @@
"rimraf": "*",
"semver": "*",
"winston": "*",
"zigbee-herdsman": "0.12.4",
"zigbee-herdsman-converters": "11.1.41"
"zigbee-herdsman": "0.12.5",
"zigbee-herdsman-converters": "11.1.42"
},
"devDependencies": {
"eslint": "*",
test/entityPublish.test.js
+12
View File
@@ -852,4 +852,16 @@ describe('Entity publish', () => {
await flushPromises();
expectNothingPublished();
});
it('Should publish state to roller shutter', async () => {
const endpoint = zigbeeHerdsman.devices.roller_shutter.getEndpoint(1);
await MQTT.events.message('zigbee2mqtt/roller_shutter/set', JSON.stringify({state: 'OPEN'}));
await flushPromises();
expect(endpoint.command).toHaveBeenCalledTimes(1);
expect(endpoint.command).toHaveBeenCalledWith("genLevelCtrl", "currentLevel", {"level": "255", "transtime": 0}, {});
expect(MQTT.publish).toHaveBeenCalledTimes(1);
expect(MQTT.publish.mock.calls[0][0]).toStrictEqual('zigbee2mqtt/roller_shutter');
expect(JSON.parse(MQTT.publish.mock.calls[0][1])).toStrictEqual({position: 100});
expect(MQTT.publish.mock.calls[0][2]).toStrictEqual({"qos": 0, "retain": false});
});
});
test/stub/data.js
+3
View File
@@ -129,6 +129,9 @@ function writeDefaultConfiguration() {
'0x90fd9ffffe4b64ae': {
retain: false,
friendly_name: 'tradfri_remote',
},
'0x90fd9ffffe4b64af': {
friendly_name: 'roller_shutter',
}
},
groups: {
test/stub/zigbeeHerdsman.js
+1
View File
@@ -128,6 +128,7 @@ const devices = {
'CC2530_ROUTER': new Device('Router', '0x0017880104e45559', 6540,4151, [new Endpoint(1, [0, 6], [])], true, "Mains (single phase)", 'lumi.router'),
'LIVOLO': new Device('Router', '0x0017880104e45560', 6541,4152, [new Endpoint(6, [0, 6], [])], true, "Mains (single phase)", 'TI0001 '),
'tradfri_remote': new Device('EndDevice', '0x90fd9ffffe4b64ae', 33906, 4476, [new Endpoint(1, [0], [0,3,4,6,8,5], '0x90fd9ffffe4b64ae')], true, "Battery", "TRADFRI remote control"),
'roller_shutter': new Device('EndDevice', '0x90fd9ffffe4b64af', 33906, 4476, [new Endpoint(1, [0], [0,3,4,6,8,5], '0x90fd9ffffe4b64af')], true, "Battery", "SCM-R_00.00.03.15TC"),
}
const groups = {