From d2710d79042788e736ce423c0a4930d0d08cb952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD?= Date: Sat, 18 Jan 2020 14:11:37 +0300 Subject: [PATCH 1/4] add more switch modelids --- README.md | 2 +- app.json | 2 +- drivers/aqara-wireless-switch-2018/driver.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 821e803..d800e05 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This app for [Athom Homey](https://homey.app/en-us/) adds support for [deCONZ](https://www.dresden-elektronik.de/funk/software/deconz.html)'s [[RaspBee](https://www.phoscon.de/en/raspbee)/[ConBee](https://www.phoscon.de/en/conbee)] child devices. -[![current version](https://img.shields.io/badge/version-0.13.2-.svg)](https://shields.io/) +[![current version](https://img.shields.io/badge/version-0.13.3-.svg)](https://shields.io/) # Installation information diff --git a/app.json b/app.json index 315a418..ce1c524 100755 --- a/app.json +++ b/app.json @@ -1,6 +1,6 @@ { "id": "ru.notabene.deconz", - "version": "0.13.2", + "version": "0.13.3", "compatibility": ">=1.5.0", "sdk": 2, "name": { diff --git a/drivers/aqara-wireless-switch-2018/driver.js b/drivers/aqara-wireless-switch-2018/driver.js index 87ad6b9..c5a9206 100644 --- a/drivers/aqara-wireless-switch-2018/driver.js +++ b/drivers/aqara-wireless-switch-2018/driver.js @@ -9,8 +9,8 @@ class AqaraWirelessSwitch2018Driver extends Driver { this.log('AqaraWirelessSwitch2018Driver has been initiated') } - onPairListDevices(data, callback) { - this.getSensorsByCondition(device => device.modelid === 'lumi.remote.b286acn01', callback) + onPairListDevices(_, callback) { + this.getSensorsByCondition(device => ['lumi.remote.b286acn01', 'lumi.remote.b1acn01', 'lumi.remote.b186acn01'].includes(device.modelid), callback) } } From 5ddad8592a5ace64fdf12659e1d095bcf68eaeea Mon Sep 17 00:00:00 2001 From: fantomnotabene Date: Thu, 2 Apr 2020 13:53:57 +0300 Subject: [PATCH 2/4] lumi.remote.b1acn01 is now aqara button --- README.md | 4 ++-- app.json | 2 +- drivers/aqara-button/driver.js | 10 +++++----- drivers/aqara-wireless-switch-2018/driver.js | 10 +++++----- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 0213e17..9658852 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This app for [Athom Homey](https://homey.app/en-us/) adds support for [deCONZ](https://www.dresden-elektronik.de/funk/software/deconz.html)'s [[RaspBee](https://www.phoscon.de/en/raspbee)/[ConBee](https://www.phoscon.de/en/conbee)] child devices. -[![current version](https://img.shields.io/badge/version-0.14.0-.svg)](https://shields.io/) +[![current version](https://img.shields.io/badge/version-0.14.2-.svg)](https://shields.io/) # Installation information @@ -29,7 +29,7 @@ Almost there. Now you can install app using `athom app install` command being in - [x] Aqara leakage sensor - [x] Honeywell Smoke sensor - [x] Philips Hue Dimmer Switch -- [x] Symfonisk remote +- [x] Symfonisk remote - [x] TRÅDFRI wireless (round) dimmer - [x] TRÅDFRI square dimmer - [x] TRÅDFRI remote control diff --git a/app.json b/app.json index 6833610..5de57cc 100755 --- a/app.json +++ b/app.json @@ -1,6 +1,6 @@ { "id": "ru.notabene.deconz", - "version": "0.14.0", + "version": "0.14.2", "compatibility": ">=1.5.0", "sdk": 2, "name": { diff --git a/drivers/aqara-button/driver.js b/drivers/aqara-button/driver.js index d3981a4..230eb85 100644 --- a/drivers/aqara-button/driver.js +++ b/drivers/aqara-button/driver.js @@ -3,16 +3,16 @@ const Driver = require('../Driver') class AqaraButtonDriver extends Driver { - + onInit() { super.onInit() this.log('AqaraButtonDriver has been initiated') } - + onPairListDevices(data, callback) { - this.getSensorsByCondition(device => device.modelid === 'lumi.sensor_switch.aq2', callback) + this.getSensorsByCondition(device => ['lumi.remote.b1acn01', 'lumi.sensor_switch.aq2'].includes(device.modelid), callback) } - + } -module.exports = AqaraButtonDriver \ No newline at end of file +module.exports = AqaraButtonDriver diff --git a/drivers/aqara-wireless-switch-2018/driver.js b/drivers/aqara-wireless-switch-2018/driver.js index c5a9206..00f6cf4 100644 --- a/drivers/aqara-wireless-switch-2018/driver.js +++ b/drivers/aqara-wireless-switch-2018/driver.js @@ -3,16 +3,16 @@ const Driver = require('../Driver') class AqaraWirelessSwitch2018Driver extends Driver { - + onInit() { super.onInit() this.log('AqaraWirelessSwitch2018Driver has been initiated') } - + onPairListDevices(_, callback) { - this.getSensorsByCondition(device => ['lumi.remote.b286acn01', 'lumi.remote.b1acn01', 'lumi.remote.b186acn01'].includes(device.modelid), callback) + this.getSensorsByCondition(device => ['lumi.remote.b286acn01', 'lumi.remote.b186acn01'].includes(device.modelid), callback) } - + } -module.exports = AqaraWirelessSwitch2018Driver \ No newline at end of file +module.exports = AqaraWirelessSwitch2018Driver From d41bc6a0d285d568f8f4a63a28e1a19247ce6264 Mon Sep 17 00:00:00 2001 From: fantomnotabene Date: Thu, 2 Apr 2020 13:59:43 +0300 Subject: [PATCH 3/4] lumi.remote.b186acn01 is a 2016 switch --- drivers/aqara-wireless-switch-2016/driver.js | 10 +++++----- drivers/aqara-wireless-switch-2018/driver.js | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/aqara-wireless-switch-2016/driver.js b/drivers/aqara-wireless-switch-2016/driver.js index d90f163..3ab3b08 100644 --- a/drivers/aqara-wireless-switch-2016/driver.js +++ b/drivers/aqara-wireless-switch-2016/driver.js @@ -3,16 +3,16 @@ const Driver = require('../Driver') class AqaraWirelessSwitch2016Driver extends Driver { - + onInit() { super.onInit() this.log('AqaraWirelessSwitch2016Driver has been initiated') } - + onPairListDevices(data, callback) { - this.getSensorsByCondition(device => device.modelid === 'lumi.sensor_86sw2' || device.modelid === 'lumi.sensor_86sw2Un', callback) + this.getSensorsByCondition(device => ['lumi.sensor_86sw2', 'lumi.sensor_86sw2Un', 'lumi.remote.b186acn01'].includes(device.modelid), callback) } - + } -module.exports = AqaraWirelessSwitch2016Driver \ No newline at end of file +module.exports = AqaraWirelessSwitch2016Driver diff --git a/drivers/aqara-wireless-switch-2018/driver.js b/drivers/aqara-wireless-switch-2018/driver.js index 00f6cf4..e72d07d 100644 --- a/drivers/aqara-wireless-switch-2018/driver.js +++ b/drivers/aqara-wireless-switch-2018/driver.js @@ -10,7 +10,7 @@ class AqaraWirelessSwitch2018Driver extends Driver { } onPairListDevices(_, callback) { - this.getSensorsByCondition(device => ['lumi.remote.b286acn01', 'lumi.remote.b186acn01'].includes(device.modelid), callback) + this.getSensorsByCondition(device => device.modelid == 'lumi.remote.b286acn01'), callback) } } From a99d9ffa6784d8f0abb7833b7f99964e7898b7bd Mon Sep 17 00:00:00 2001 From: fantomnotabene Date: Thu, 2 Apr 2020 14:33:56 +0300 Subject: [PATCH 4/4] the extra parenthesis removed --- drivers/aqara-wireless-switch-2018/driver.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/aqara-wireless-switch-2018/driver.js b/drivers/aqara-wireless-switch-2018/driver.js index e72d07d..2060f67 100644 --- a/drivers/aqara-wireless-switch-2018/driver.js +++ b/drivers/aqara-wireless-switch-2018/driver.js @@ -10,7 +10,7 @@ class AqaraWirelessSwitch2018Driver extends Driver { } onPairListDevices(_, callback) { - this.getSensorsByCondition(device => device.modelid == 'lumi.remote.b286acn01'), callback) + this.getSensorsByCondition(device => device.modelid == 'lumi.remote.b286acn01', callback) } }