From 27b3fd2f03c383543e1e39778a4e8e1f5de5b5a9 Mon Sep 17 00:00:00 2001 From: Koen Kanters Date: Sun, 15 Mar 2020 22:26:03 +0100 Subject: [PATCH] Update converters. --- npm-shrinkwrap.json | 6 +++--- package.json | 2 +- test/otaUpdate.test.js | 6 +++--- test/stub/zigbeeHerdsman.js | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index ca39729a2..c1da003c1 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -14819,9 +14819,9 @@ } }, "zigbee-herdsman-converters": { - "version": "12.0.48", - "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.48.tgz", - "integrity": "sha512-nDeZq6K+C9qKsk97E/Z9Exrc4vumKUUw6ezcyPpSaL5yrGCOY9DzJ4wiPSVmzXrezpisxZujvussBJqdm8B0Pw==", + "version": "12.0.49", + "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.49.tgz", + "integrity": "sha512-3nbKbM/JDzyuTCeh8ysti5W42Xnnn7tw3LFf9FWdBl35KchoKbkLWeZ7kWrsilC/jhy+M9AjMvrhDDozx87OXA==", "requires": { "axios": "*", "tar-stream": "*" diff --git a/package.json b/package.json index e2fe608b3..d4ebf5fa4 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "semver": "*", "winston": "*", "zigbee-herdsman": "0.12.63", - "zigbee-herdsman-converters": "12.0.48" + "zigbee-herdsman-converters": "12.0.49" }, "devDependencies": { "eslint": "*", diff --git a/test/otaUpdate.test.js b/test/otaUpdate.test.js index a8cc81f7a..0b7668e67 100644 --- a/test/otaUpdate.test.js +++ b/test/otaUpdate.test.js @@ -119,9 +119,9 @@ describe('OTA update', () => { }); it('Should not check for OTA when device does not support it', async () => { - MQTT.events.message('zigbee2mqtt/bridge/ota_update/check', 'bulb_color_2'); + MQTT.events.message('zigbee2mqtt/bridge/ota_update/check', 'ZNLDP12LM'); await flushPromises(); - expect(logger.error).toHaveBeenCalledWith(`Device 'bulb_color_2' does not support OTA updates`); + expect(logger.error).toHaveBeenCalledWith(`Device 'ZNLDP12LM' does not support OTA updates`); }); it('Should refuse to check/update when already in progress', async () => { @@ -193,7 +193,7 @@ describe('OTA update', () => { }); it('Should respond with NO_IMAGE_AVAILABLE when not supporting OTA', async () => { - const device = zigbeeHerdsman.devices.bulb_color; + const device = zigbeeHerdsman.devices.QBKG04LM; const data = {imageType: 12382}; const payload = {data, cluster: 'genOta', device, endpoint: device.getEndpoint(1), type: 'commandQueryNextImageRequest', linkquality: 10}; await zigbeeHerdsman.events.message(payload); diff --git a/test/stub/zigbeeHerdsman.js b/test/stub/zigbeeHerdsman.js index 39fd02c7f..2bb30b9fd 100644 --- a/test/stub/zigbeeHerdsman.js +++ b/test/stub/zigbeeHerdsman.js @@ -121,7 +121,7 @@ const devices = { 'RTCGQ11LM': new Device('EndDevice', '0x0017880104e45523', 6540,4151, [new Endpoint(1, [0], [])], true, "Battery", "lumi.sensor_motion.aq2"), 'ZNCZ02LM': new Device('Router', '0x0017880104e45524', 6540,4151, [new Endpoint(1, [0], [])], true, "Mains (single phase)", "lumi.plug"), 'E1743': new Device('Router', '0x0017880104e45540', 6540,4476, [new Endpoint(1, [0], [])], true, "Mains (single phase)", 'TRADFRI on/off switch'), - 'QBKG04LM': new Device('Router', '0x0017880104e45541', 6549,4151, [new Endpoint(1, [0], []), new Endpoint(2, [0, 6], [])], true, "Mains (single phase)", 'lumi.ctrl_neutral1'), + 'QBKG04LM': new Device('Router', '0x0017880104e45541', 6549,4151, [new Endpoint(1, [0], [25]), new Endpoint(2, [0, 6], [])], true, "Mains (single phase)", 'lumi.ctrl_neutral1'), 'QBKG03LM':new Device('Router', '0x0017880104e45542', 6540,4151, [new Endpoint(1, [0], [], '0x0017880104e45542'), new Endpoint(2, [0, 6], [], '0x0017880104e45542'), new Endpoint(3, [0, 6], [], '0x0017880104e45542')], true, "Mains (single phase)", 'lumi.ctrl_neutral2'), 'GLEDOPTO1112': new Device('Router', '0x0017880104e45543', 6540, 4151, [new Endpoint(11, [0], [], '0x0017880104e45543'), new Endpoint(13, [0], [], '0x0017880104e45543')], true, "Mains (single phase)", 'GL-C-008'), 'GLEDOPTO111213': new Device('Router', '0x0017880104e45544', 6540,4151, [new Endpoint(11, [0], []), new Endpoint(13, [0], []), new Endpoint(12, [0], [])], true, "Mains (single phase)", 'GL-C-008'),