diff --git a/lib/zigbee.js b/lib/zigbee.js index 3af4ba43..26ed2b17 100644 --- a/lib/zigbee.js +++ b/lib/zigbee.js @@ -73,7 +73,7 @@ class Zigbee extends events.EventEmitter { // Check if we have to turn off the led if (settings.get().serial.disable_led) { - this.herdsman.disableLED(); + this.herdsman.setLED(false); } } diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 89def91b..0c765cfe 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -6053,9 +6053,9 @@ } }, "zigbee-herdsman": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.7.2.tgz", - "integrity": "sha512-OpZhR6UOR9VIJoEHnsp5JrgYdCIvaSw9D4mCFBf4Q2YfllfnCGAHaA4t7eSYqrIMOLpY3nCYHCDhbB57N5W9oA==", + "version": "0.7.6", + "resolved": "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.7.6.tgz", + "integrity": "sha512-Od4XNGLT6hxkFeibotU1WoopjAGvDc2LUpcly1rER0PA+clKU8WgkYvYkqBTqjfja1Q1s89k3QTgv+365nsxmg==", "requires": { "debug": "^4.1.1", "fast-deep-equal": "^2.0.1", diff --git a/package.json b/package.json index 65cffebb..870f46c9 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "rimraf": "*", "semver": "*", "winston": "*", - "zigbee-herdsman": "0.7.2", + "zigbee-herdsman": "0.7.6", "zigbee-herdsman-converters": "11.1.14" }, "devDependencies": { diff --git a/test/controller.test.js b/test/controller.test.js index 6f5f7bef..c7e0f81a 100644 --- a/test/controller.test.js +++ b/test/controller.test.js @@ -33,7 +33,7 @@ describe('Controller', () => { 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"),"backupPath":path.join(data.mockDir, "coordinator_backup.json"),"serialPort":{"baudRate":115200,"rtscts":true,"path":"/dev/dummy"}}); expect(zigbeeHerdsman.start).toHaveBeenCalledTimes(1); - expect(zigbeeHerdsman.disableLED).toHaveBeenCalledTimes(0); + expect(zigbeeHerdsman.setLED).toHaveBeenCalledTimes(0); expect(zigbeeHerdsman.permitJoin).toHaveBeenCalledTimes(1); expect(zigbeeHerdsman.permitJoin).toHaveBeenCalledWith(true); expect(logger.info).toHaveBeenCalledWith(`Currently ${Object.values(zigbeeHerdsman.devices).length - 1} devices are joined:`) @@ -169,10 +169,11 @@ describe('Controller', () => { expect(mockExit).toHaveBeenCalledWith(1); }); - it('Start controller with permit join true', async () => { + it('Start controller with disable_led', async () => { settings.set(['serial', 'disable_led'], true); await controller.start(); - expect(zigbeeHerdsman.disableLED).toHaveBeenCalledTimes(1); + expect(zigbeeHerdsman.setLED).toHaveBeenCalledTimes(1); + expect(zigbeeHerdsman.setLED).toHaveBeenCalledWith(false); }); it('Start controller and stop', async () => { diff --git a/test/stub/zigbeeHerdsman.js b/test/stub/zigbeeHerdsman.js index 6e69f05d..3590dc94 100644 --- a/test/stub/zigbeeHerdsman.js +++ b/test/stub/zigbeeHerdsman.js @@ -135,7 +135,7 @@ const mock = { events[type] = handler; }, stop: jest.fn(), - disableLED: jest.fn(), + setLED: jest.fn(), getDevices: jest.fn().mockImplementation(() => { return Object.values(devices).filter((d) => returnDevices.length === 0 || returnDevices.includes(d.ieeeAddr)); }),