rasperrypi-home/hassio-plejd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #38 from icanos/dev

Browse source 
resolved null usage exception
This commit is contained in:
Marcus Westin 2020-01-15 10:34:29 +01:00 • committed by GitHub
commit 381157138e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

35
plejd/ble.js
View file

@ -147,7 +147,7 @@ class PlejdService extends EventEmitter {
this._turnOff(id); this._turnOff(id);
return; return;
} }
this._turnOn(id, currentBrightness); this._turnOn(id, currentBrightness);
i++; i++;
@ -253,17 +253,28 @@ class PlejdService extends EventEmitter {
clearInterval(this.pingRef); clearInterval(this.pingRef);
this.device.removeAllListeners('servicesDiscover'); if (this.device) {
this.device.removeAllListeners('connect'); this.device.removeAllListeners('servicesDiscover');
this.device.removeAllListeners('disconnect'); this.device.removeAllListeners('connect');
this.characteristics.auth.removeAllListeners('read'); this.device.removeAllListeners('disconnect');
this.characteristics.auth.removeAllListeners('write'); }
this.characteristics.data.removeAllListeners('read'); if (this.characteristics.auth) {
this.characteristics.data.removeAllListeners('write'); this.characteristics.auth.removeAllListeners('read');
this.characteristics.lastData.removeAllListeners('read'); this.characteristics.auth.removeAllListeners('write');
this.characteristics.lastData.removeAllListeners('write'); }
this.characteristics.ping.removeAllListeners('read'); if (this.characteristics.data) {
this.characteristics.ping.removeAllListeners('write'); this.characteristics.data.removeAllListeners('read');
this.characteristics.data.removeAllListeners('write');
}
if (this.characteristics.lastData) {
this.characteristics.lastData.removeAllListeners('read');
this.characteristics.lastData.removeAllListeners('write');
}
if (this.characteristics.ping) {
this.characteristics.ping.removeAllListeners('read');
this.characteristics.ping.removeAllListeners('write');
}
this.connectEventHooked = false; this.connectEventHooked = false;

4
plejd/config.json
View file

@ -1,6 +1,6 @@
{ {
"name": "Plejd", "name": "Plejd",
"version": "0.2.5", "version": "0.2.6",
"slug": "plejd", "slug": "plejd",
"description": "Adds support for the Swedish home automation devices from Plejd.", "description": "Adds support for the Swedish home automation devices from Plejd.",
"url": "https://github.com/icanos/hassio-plejd/", "url": "https://github.com/icanos/hassio-plejd/",
@ -32,4 +32,4 @@
"mqttPassword": "str", "mqttPassword": "str",
"includeRoomsAsLights": "bool" "includeRoomsAsLights": "bool"
} }
} }

4
plejd/main.js
View file

@ -3,7 +3,7 @@ const mqtt = require('./mqtt');
const fs = require('fs'); const fs = require('fs');
const PlejdService = require('./ble'); const PlejdService = require('./ble');
const version = "0.2.5"; const version = "0.2.6";
async function main() { async function main() {
console.log('starting Plejd add-on v. ' + version); console.log('starting Plejd add-on v. ' + version);
@ -60,7 +60,7 @@ async function main() {
else if (settings.module === 'api') { else if (settings.module === 'api') {
plejdApi.updateSettings(settings); plejdApi.updateSettings(settings);
} }
}); });
}); });
}); });