watsonb8/homebridge-harmony-control
1
1
Fork 0
Code Issues 2 Pull Requests Actions Projects Releases Wiki Activity

Getting rid of externalAccessories.

Browse Source 
Rolling back external accessories specifically for remote because this was causing an unpredictable crash. (Likely an unhandled exception within either apple framework or HAPNodeJS
This commit is contained in:
watsonb8
2019-08-13 21:02:40 -04:00
parent 5c69e7b11f
commit f903c40f9c
2 changed files with 15 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Accessories/ControlUnit.ts
View File

@@ -35,7 +35,6 @@ export interface IControlUnitProps {
api: any,
log: any,
homebridge: any,
isExternal: boolean,
}
/**
@@ -48,7 +47,6 @@ export class ControlUnit implements IAccessory {
//fields
private log: any = {};
private displayName: string = "";
private isExternal: boolean = false;
//Service fields
private televisionService: HAPNodeJS.Service | undefined;
@@ -73,8 +71,7 @@ export class ControlUnit implements IAccessory {
Service = props.api.hap.Service;
Characteristic = props.api.hap.Characteristic;
this.name = props.displayName;
this.displayName = props.isExternal ? `${props.displayName}-Remote` : props.displayName;
this.isExternal = props.isExternal;
this.displayName = props.displayName;
this.activities = props.activities;
@@ -150,12 +147,10 @@ export class ControlUnit implements IAccessory {
* Event handler for SET active characteristic
*/
private onSetAccessoryActive = async (value: any) => {
if (!this.isExternal) {
switch (value) {
case 0: this.dataProvider.powerOff(this.name); break;
//Turn on with first activity
case 1: this.dataProvider.powerOn(this.name, this.activities[0]); break;
}
switch (value) {
case 0: this.dataProvider.powerOff(this.name); break;
//Turn on with first activity
case 1: this.dataProvider.powerOn(this.name, this.activities[0]); break;
}
}
@@ -171,18 +166,14 @@ export class ControlUnit implements IAccessory {
* Event handler for SET remote key
*/
private onSetRemoteKey = async (key: any) => {
if (this.isExternal) {
this.dataProvider.sendKeyPress(this.name, key);
}
this.dataProvider.sendKeyPress(this.name, key);
}
/**
* Event handler for SET active identifier characteristic
*/
private onSetActiveIdentifier = async (identifier: any) => {
if (!this.isExternal) {
this.dataProvider.startActivity(this.name, this.activities[identifier]);
}
this.dataProvider.startActivity(this.name, this.activities[identifier]);
}
/**
@@ -232,11 +223,9 @@ export class ControlUnit implements IAccessory {
* Event handler for SET volume characteristic
*/
private onSetVolumeSelector = async (value: any) => {
if (this.isExternal) {
switch (value) {
case 0: this.dataProvider.volumeUp(this.name); break;
case 1: this.dataProvider.volumeDown(this.name); break;
}
switch (value) {
case 0: this.dataProvider.volumeUp(this.name); break;
case 1: this.dataProvider.volumeDown(this.name); break;
}
}