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

Rename PlejdBLE to PlejdBLEHandler

Browse source
This commit is contained in:
Victor Hagelbäck 2021-02-08 07:39:53 +01:00
parent 7436c56c25
commit 40f79df37e
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
plejd/PlejdAddon.js
View file

@ -3,7 +3,8 @@ const EventEmitter = require('events');
const Configuration = require('./Configuration'); const Configuration = require('./Configuration');
const Logger = require('./Logger'); const Logger = require('./Logger');
const PlejdApi = require('./PlejdApi'); const PlejdApi = require('./PlejdApi');
const PlejdBLE = require('./PlejdBLE'); // const PlejdBLE = require('./PlejdBLE');
const PlejdBLEHandler = require('./PlejdBLEHandler');
const MqttClient = require('./MqttClient'); const MqttClient = require('./MqttClient');
const SceneManager = require('./SceneManager'); const SceneManager = require('./SceneManager');
const DeviceRegistry = require('./DeviceRegistry'); const DeviceRegistry = require('./DeviceRegistry');
@ -15,7 +16,7 @@ class PlejdAddon extends EventEmitter {
config; config;
deviceRegistry; deviceRegistry;
plejdApi; plejdApi;
plejdBLE; plejdBLEHandler;
mqttClient; mqttClient;
sceneManager; sceneManager;
@ -26,8 +27,8 @@ class PlejdAddon extends EventEmitter {
this.deviceRegistry = new DeviceRegistry(); this.deviceRegistry = new DeviceRegistry();
this.plejdApi = new PlejdApi(this.deviceRegistry); this.plejdApi = new PlejdApi(this.deviceRegistry);
this.plejdBLE = new PlejdBLE(this.deviceRegistry); this.plejdBLEHandler = new PlejdBLEHandler(this.deviceRegistry);
this.sceneManager = new SceneManager(this.deviceRegistry, this.plejdBle); this.sceneManager = new SceneManager(this.deviceRegistry, this.plejdBLEHandler);
this.mqttClient = new MqttClient(this.deviceRegistry); this.mqttClient = new MqttClient(this.deviceRegistry);
} }
@ -87,9 +88,9 @@ class PlejdAddon extends EventEmitter {
} }
if (state === 'ON') { if (state === 'ON') {
this.plejdBLE.turnOn(deviceId, commandObj); this.plejdBLEHandler.turnOn(deviceId, commandObj);
} else { } else {
this.plejdBLE.turnOff(deviceId, commandObj); this.plejdBLEHandler.turnOff(deviceId, commandObj);
} }
} catch (err) { } catch (err) {
logger.error('Error in MqttClient.stateChanged callback in main.js', err); logger.error('Error in MqttClient.stateChanged callback in main.js', err);
@ -99,19 +100,19 @@ class PlejdAddon extends EventEmitter {
this.mqttClient.init(); this.mqttClient.init();
// init the BLE interface // init the BLE interface
this.plejdBLE.on('connectFailed', () => { this.plejdBLEHandler.on('connectFailed', () => {
logger.verbose('Were unable to connect, will retry.'); logger.verbose('Were unable to connect, will retry.');
this._bleInitLoop(); this._bleInitLoop();
}); });
// this.plejdBLE.init(); // this.plejdBLE.init();
this.plejdBLE.on('authenticated', () => { this.plejdBLEHandler.on('authenticated', () => {
logger.verbose('plejd: connected via bluetooth.'); logger.verbose('plejd: connected via bluetooth.');
}); });
// subscribe to changes from Plejd // subscribe to changes from Plejd
this.plejdBLE.on('stateChanged', (deviceId, command) => { this.plejdBLEHandler.on('stateChanged', (deviceId, command) => {
try { try {
this.mqttClient.updateState(deviceId, command); this.mqttClient.updateState(deviceId, command);
} catch (err) { } catch (err) {
@ -119,7 +120,7 @@ class PlejdAddon extends EventEmitter {
} }
}); });
this.plejdBLE.on('sceneTriggered', (deviceId, sceneId) => { this.plejdBLEHandler.on('sceneTriggered', (deviceId, sceneId) => {
try { try {
this.mqttClient.sceneTriggered(sceneId); this.mqttClient.sceneTriggered(sceneId);
} catch (err) { } catch (err) {
@ -135,7 +136,7 @@ class PlejdAddon extends EventEmitter {
if (this.bleInitTimeout) { if (this.bleInitTimeout) {
clearTimeout(this.bleInitTimeout); clearTimeout(this.bleInitTimeout);
} }
await this.plejdBLE.init(); await this.plejdBLEHandler.init();
} catch (err) { } catch (err) {
logger.warn('Failed BLE init, trying again in 35s', err); logger.warn('Failed BLE init, trying again in 35s', err);
this.bleInitTimer = setTimeout(() => { this.bleInitTimer = setTimeout(() => {

0
plejd/PlejdBLE.js → plejd/PlejdBLEHandler.js
View file