Compare commits
4 Commits
1.0.2
...
feature/ne
| Author | SHA1 | Date | |
|---|---|---|---|
| ed0b418b4d | |||
| 2475aea1c8 | |||
| 31c5c5b9e2 | |||
| a539287b9e |
87
config.json
87
config.json
@ -1,7 +1,7 @@
|
||||
{
|
||||
"bridge": {
|
||||
"name": "Homebridge",
|
||||
"username": "CC:22:3D:E3:CE:74",
|
||||
"username": "CC:22:3D:E3:CE:42",
|
||||
"port": 51826,
|
||||
"pin": "031-45-154"
|
||||
},
|
||||
@ -13,8 +13,10 @@
|
||||
},
|
||||
{
|
||||
"platform": "HarmonyHubMatrix",
|
||||
"hubIp": "192.168.1.14",
|
||||
"harmonyHubIp": "192.168.1.14",
|
||||
"neeoHubIp": "192.168.1.24",
|
||||
"Matrix": {
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "Gefen AV Switch",
|
||||
"Inputs": [
|
||||
{
|
||||
@ -57,14 +59,17 @@
|
||||
"DisplayName": "Chromecast",
|
||||
"DeviceSetupList": [
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "LG TV",
|
||||
"Input": "Hdmi1"
|
||||
"Input": "HDMI1"
|
||||
},
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "JVC AV Receiver",
|
||||
"Input": "Dvd"
|
||||
"Input": "DVD"
|
||||
},
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "Chromecast",
|
||||
"Input": []
|
||||
}
|
||||
@ -78,16 +83,19 @@
|
||||
"DisplayName": "Play Xbox One",
|
||||
"DeviceSetupList": [
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "Microsoft Xbox One",
|
||||
"Input": []
|
||||
},
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "LG TV",
|
||||
"Input": "Hdmi1"
|
||||
"Input": "HDMI1"
|
||||
},
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "JVC AV Receiver",
|
||||
"Input": "Dvd"
|
||||
"Input": "DVD"
|
||||
}
|
||||
],
|
||||
"VolumeDevice": "JVC AV Receiver",
|
||||
@ -99,16 +107,19 @@
|
||||
"DisplayName": "Play PS4",
|
||||
"DeviceSetupList": [
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "Sony PS4",
|
||||
"Input": []
|
||||
},
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "LG TV",
|
||||
"Input": "Hdmi1"
|
||||
"Input": "HDMI1"
|
||||
},
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "JVC AV Receiver",
|
||||
"Input": "Dvd"
|
||||
"Input": "DVD"
|
||||
}
|
||||
],
|
||||
"VolumeDevice": "JVC AV Receiver",
|
||||
@ -120,16 +131,19 @@
|
||||
"DisplayName": "Apple TV",
|
||||
"DeviceSetupList": [
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "Apple TV Gen 4",
|
||||
"Input": []
|
||||
},
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "LG TV",
|
||||
"Input": "Hdmi1"
|
||||
"Input": "HDMI1"
|
||||
},
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "JVC AV Receiver",
|
||||
"Input": "Dvd"
|
||||
"Input": "DVD"
|
||||
}
|
||||
],
|
||||
"VolumeDevice": "JVC AV Receiver",
|
||||
@ -141,8 +155,9 @@
|
||||
"DisplayName": "Listen to Music",
|
||||
"DeviceSetupList": [
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "JVC AV Receiver",
|
||||
"Input": "CD"
|
||||
"Input": "DVD"
|
||||
}
|
||||
],
|
||||
"VolumeDevice": "JVC AV Receiver",
|
||||
@ -159,19 +174,22 @@
|
||||
"DisplayName": "Chromecast",
|
||||
"DeviceSetupList": [
|
||||
{
|
||||
"Hub": "Neeo",
|
||||
"DeviceName": "Vizio TV",
|
||||
"Input": "Hdmi1"
|
||||
"Input": "HDMI1"
|
||||
},
|
||||
{
|
||||
"DeviceName": "Harman Kardon AV Receiver",
|
||||
"Hub": "Neeo",
|
||||
"DeviceName": "Harmon Kardon Receicer",
|
||||
"Input": "Game"
|
||||
},
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "Chromecast",
|
||||
"Input": []
|
||||
}
|
||||
],
|
||||
"VolumeDevice": "Harman Kardon AV Receiver",
|
||||
"VolumeDevice": "Harmon Kardon Receicer",
|
||||
"ControlDevice": "Chromecast",
|
||||
"OutputDevice": "Vizio TV",
|
||||
"UseMatrix": "true"
|
||||
@ -180,19 +198,22 @@
|
||||
"DisplayName": "Play Xbox One",
|
||||
"DeviceSetupList": [
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "Microsoft Xbox One",
|
||||
"Input": []
|
||||
},
|
||||
{
|
||||
"Hub": "Neeo",
|
||||
"DeviceName": "Vizio TV",
|
||||
"Input": "Hdmi1"
|
||||
"Input": "HDMI1"
|
||||
},
|
||||
{
|
||||
"DeviceName": "Harman Kardon AV Receiver",
|
||||
"Hub": "Neeo",
|
||||
"DeviceName": "Harmon Kardon Receicer",
|
||||
"Input": "Game"
|
||||
}
|
||||
],
|
||||
"VolumeDevice": "Harman Kardon AV Receiver",
|
||||
"VolumeDevice": "Harmon Kardon Receicer",
|
||||
"ControlDevice": "Microsoft Xbox One",
|
||||
"OutputDevice": "Vizio TV",
|
||||
"UseMatrix": "true"
|
||||
@ -201,19 +222,22 @@
|
||||
"DisplayName": "Play PS4",
|
||||
"DeviceSetupList": [
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "Sony PS4",
|
||||
"Input": []
|
||||
},
|
||||
{
|
||||
"Hub": "Neeo",
|
||||
"DeviceName": "Vizio TV",
|
||||
"Input": "Hdmi1"
|
||||
"Input": "HDMI1"
|
||||
},
|
||||
{
|
||||
"DeviceName": "Harman Kardon AV Receiver",
|
||||
"Input": "Dvd"
|
||||
"Hub": "Neeo",
|
||||
"DeviceName": "Harmon Kardon Receicer",
|
||||
"Input": "DVD"
|
||||
}
|
||||
],
|
||||
"VolumeDevice": "Harman Kardon AV Receiver",
|
||||
"VolumeDevice": "Harmon Kardon Receicer",
|
||||
"ControlDevice": "Sony PS4",
|
||||
"OutputDevice": "LG TV",
|
||||
"UseMatrix": "true"
|
||||
@ -222,19 +246,22 @@
|
||||
"DisplayName": "Apple TV",
|
||||
"DeviceSetupList": [
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "Apple TV Gen 4",
|
||||
"Input": []
|
||||
},
|
||||
{
|
||||
"Hub": "Neeo",
|
||||
"DeviceName": "Vizio TV",
|
||||
"Input": "Hdmi1"
|
||||
"Input": "HDMI1"
|
||||
},
|
||||
{
|
||||
"DeviceName": "Harman Kardon AV Receiver",
|
||||
"Hub": "Neeo",
|
||||
"DeviceName": "Harmon Kardon Receicer",
|
||||
"Input": "Game"
|
||||
}
|
||||
],
|
||||
"VolumeDevice": "Harman Kardon AV Receiver",
|
||||
"VolumeDevice": "Harmon Kardon Receicer",
|
||||
"ControlDevice": "Apple TV Gen 4",
|
||||
"OutputDevice": "Vizio TV",
|
||||
"UseMatrix": "true"
|
||||
@ -248,12 +275,14 @@
|
||||
"DisplayName": "Chromecast",
|
||||
"DeviceSetupList": [
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "Chromecast",
|
||||
"Input": []
|
||||
},
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "Westinghouse TV",
|
||||
"Input": "Hdmi1"
|
||||
"Input": "HDMI1"
|
||||
}
|
||||
],
|
||||
"VolumeDevice": "Westinghouse TV",
|
||||
@ -265,12 +294,14 @@
|
||||
"DisplayName": "Watch Apple Tv",
|
||||
"DeviceSetupList": [
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "Apple TV Gen 4",
|
||||
"Input": []
|
||||
},
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "Westinghouse TV",
|
||||
"Input": "Hdmi1"
|
||||
"Input": "HDMI1"
|
||||
}
|
||||
],
|
||||
"VolumeDevice": "Westinghouse TV",
|
||||
@ -282,10 +313,12 @@
|
||||
"DisplayName": "Play Xbox One",
|
||||
"DeviceSetupList": [
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "Westinghouse TV",
|
||||
"Input": "Hdmi1"
|
||||
"Input": "HDMI1"
|
||||
},
|
||||
{
|
||||
"Hub": "Harmony",
|
||||
"DeviceName": "Microsoft Xbox One",
|
||||
"Input": []
|
||||
}
|
||||
|
||||
22
deploy.sh
22
deploy.sh
@ -1,22 +0,0 @@
|
||||
#!/bin/bash
|
||||
remote_user="bmw"
|
||||
remote_server="192.168.1.31"
|
||||
deploy_location="/home/bmw/homebridge-harmony-control"
|
||||
homebridge_location="/var/lib/homebridge/"
|
||||
|
||||
#build
|
||||
tsc --build
|
||||
#copy files to remote machine
|
||||
scp -r bin $remote_user@$remote_server:$deploy_location
|
||||
scp package.json $remote_user@$remote_server:$deploy_location
|
||||
|
||||
#install package
|
||||
ssh -t $remote_user@$remote_server "sudo npm install -g --unsafe-perm $deploy_location"
|
||||
|
||||
#restart service
|
||||
ssh -t
|
||||
ssh -t $remote_user@$remote_server "sudo systemctl restart homebridge.service"
|
||||
ssh -t $remote_user@$remote_server "sudo systemctl status homebridge.service"
|
||||
|
||||
echo done
|
||||
exit
|
||||
13
package-lock.json
generated
13
package-lock.json
generated
@ -748,6 +748,14 @@
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.7.tgz",
|
||||
"integrity": "sha512-1YKeT4JitGgE4SOzyB9eMwO0nGVNkNEsm9qlIt1Lqm/tG2QEiSMTD4kS3aO6L+w5SClLVxALmIBESK6Mk5wX0A=="
|
||||
},
|
||||
"@types/node-fetch": {
|
||||
"version": "2.5.0",
|
||||
"resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.0.tgz",
|
||||
"integrity": "sha512-TLFRywthBgL68auWj+ziWu+vnmmcHCDFC/sqCOQf1xTz4hRq8cu79z8CtHU9lncExGBsB8fXA4TiLDLt6xvMzw==",
|
||||
"requires": {
|
||||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"ajv": {
|
||||
"version": "6.10.0",
|
||||
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
|
||||
@ -1541,6 +1549,11 @@
|
||||
"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
|
||||
"integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
|
||||
},
|
||||
"node-fetch": {
|
||||
"version": "2.6.0",
|
||||
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
|
||||
"integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
|
||||
},
|
||||
"node-persist": {
|
||||
"version": "0.0.8",
|
||||
"resolved": "https://registry.npmjs.org/node-persist/-/node-persist-0.0.8.tgz",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "homebridge-harmony-control",
|
||||
"version": "1.0.2",
|
||||
"version": "1.0.0",
|
||||
"description": "Homebridge platform to control smart home equipment by room.",
|
||||
"main": "bin/index.js",
|
||||
"scripts": {
|
||||
@ -35,8 +35,10 @@
|
||||
"@babel/preset-env": "^7.4.5",
|
||||
"@babel/preset-typescript": "^7.3.3",
|
||||
"@types/node": "^12.0.7",
|
||||
"@types/node-fetch": "^2.5.0",
|
||||
"harmony-websocket": "^1.1.0",
|
||||
"homebridge": "^0.4.50",
|
||||
"node-fetch": "^2.6.0",
|
||||
"request": "^2.88.0"
|
||||
}
|
||||
}
|
||||
@ -2,7 +2,7 @@ import { Activity } from '../Models/Activity';
|
||||
import { Matrix } from '../Models/Matrix';
|
||||
import { IAccessory } from './IAccessory';
|
||||
import callbackify from '../Util/Callbackify';
|
||||
import HarmonyDataProvider from '../DataProviders/HarmonyDataProvider';
|
||||
import HubDataProvider from '../DataProviders/HubDataProvider';
|
||||
|
||||
let Service: HAPNodeJS.Service;
|
||||
let Characteristic: HAPNodeJS.Characteristic;
|
||||
@ -29,12 +29,13 @@ export enum RemoteKey {
|
||||
}
|
||||
|
||||
export interface IControlUnitProps {
|
||||
dataProvider: HarmonyDataProvider,
|
||||
dataProvider: HubDataProvider,
|
||||
displayName: string,
|
||||
activities: Array<Activity>,
|
||||
api: any,
|
||||
log: any,
|
||||
homebridge: any,
|
||||
isExternal: boolean,
|
||||
}
|
||||
|
||||
/**
|
||||
@ -47,6 +48,7 @@ export class ControlUnit implements IAccessory {
|
||||
//fields
|
||||
private log: any = {};
|
||||
private displayName: string = "";
|
||||
private isExternal: boolean = false;
|
||||
|
||||
//Service fields
|
||||
private televisionService: HAPNodeJS.Service | undefined;
|
||||
@ -56,7 +58,7 @@ export class ControlUnit implements IAccessory {
|
||||
|
||||
//Harmony fields
|
||||
private activities: Array<Activity> = [];
|
||||
private dataProvider: HarmonyDataProvider;
|
||||
private dataProvider: HubDataProvider;
|
||||
|
||||
public platformAccessory: any;
|
||||
|
||||
@ -71,7 +73,8 @@ export class ControlUnit implements IAccessory {
|
||||
Service = props.api.hap.Service;
|
||||
Characteristic = props.api.hap.Characteristic;
|
||||
this.name = props.displayName;
|
||||
this.displayName = props.displayName;
|
||||
this.displayName = props.isExternal ? `${props.displayName}-Remote` : props.displayName;
|
||||
this.isExternal = props.isExternal;
|
||||
|
||||
this.activities = props.activities;
|
||||
|
||||
@ -131,10 +134,11 @@ export class ControlUnit implements IAccessory {
|
||||
.on("get", callbackify(this.onGetAccessoryActive));
|
||||
|
||||
//Set remote characteristics if is external
|
||||
if (this.isExternal) {
|
||||
this.televisionService.getCharacteristic(Characteristic.RemoteKey)
|
||||
//@ts-ignore
|
||||
.on("set", callbackify(this.onSetRemoteKey));
|
||||
|
||||
}
|
||||
|
||||
this.televisionService.getCharacteristic(Characteristic.ActiveIdentifier)
|
||||
//@ts-ignore
|
||||
@ -147,34 +151,40 @@ 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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Event handler for GET active characteristic
|
||||
*/
|
||||
private onGetAccessoryActive = async () => {
|
||||
//@ts-ignore
|
||||
return this.dataProvider.getIsActive(this.name) ? Characteristic.Active.Active : Characteristic.Active.Inactive
|
||||
return this.dataProvider.getIsActive() ? Characteristic.Active.Active : Characteristic.Active.Inactive
|
||||
}
|
||||
|
||||
/**
|
||||
* Event handler for SET remote key
|
||||
*/
|
||||
private onSetRemoteKey = async (key: any) => {
|
||||
if (this.isExternal) {
|
||||
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]);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Event handler for GET active identifier characteristic
|
||||
@ -223,11 +233,29 @@ 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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*********************
|
||||
*
|
||||
* Information Service
|
||||
*
|
||||
********************/
|
||||
|
||||
/**
|
||||
* Configure information service
|
||||
*/
|
||||
private configureAccessoryInformation(): void {
|
||||
this.informationService = new Service.AccessoryInformation(this.displayName, 'information');
|
||||
this.informationService
|
||||
.setCharacteristic(Characteristic.Manufacturer, 'Loftux Carwings')
|
||||
.setCharacteristic(Characteristic.Model, 'Heater-Cooler')
|
||||
}
|
||||
|
||||
/*****************
|
||||
*
|
||||
|
||||
@ -1,58 +1,69 @@
|
||||
import { Activity } from "../Models/Activity";
|
||||
import { DeviceSetupItem } from "../Models/DeviceSetupItem";
|
||||
import { Input, Matrix, Output } from "../Models/Matrix";
|
||||
import { IDevice } from './IDevice';
|
||||
import { RemoteKey } from '../Accessories/ControlUnit';
|
||||
import { sleep } from '../Util/Sleep';
|
||||
import { hub } from "..";
|
||||
import fetch from 'node-fetch';
|
||||
|
||||
let Characteristic: HAPNodeJS.Characteristic;
|
||||
|
||||
const Harmony = require("harmony-websocket");
|
||||
interface IDevice {
|
||||
id: string,
|
||||
name: string,
|
||||
supportsCommand(commandName: string): boolean,
|
||||
getCommand(commandName: string): string,
|
||||
commands: { [name: string]: string };
|
||||
on: boolean;
|
||||
}
|
||||
|
||||
interface IActivityState {
|
||||
currentActivity: Activity
|
||||
}
|
||||
|
||||
interface IHarmonyDataProviderProps {
|
||||
hubAddress: string,
|
||||
interface IHubDataProviderProps {
|
||||
harmonyHubAddress: string,
|
||||
neeoHubAddress: string,
|
||||
log: any,
|
||||
matrix: Matrix
|
||||
}
|
||||
|
||||
class HarmonyDataProvider {
|
||||
private harmony: any;
|
||||
interface INeeoMacro {
|
||||
roomKey: string,
|
||||
macroKey: string,
|
||||
deviceKey: string,
|
||||
}
|
||||
|
||||
class HubDataProvider {
|
||||
//Harmony Fields
|
||||
private harmonyHubAddress: string;
|
||||
private harmonyConnected: boolean = false;
|
||||
|
||||
//Neeo Fields
|
||||
private neeoHubAddress: string;
|
||||
|
||||
//Common Fields
|
||||
private log: any;
|
||||
private hubAddress: string = "";
|
||||
private connected: boolean = false;
|
||||
|
||||
private devices: { [name: string]: IDevice; } = {};
|
||||
private states: { [controlUnitName: string]: (IActivityState | undefined) } = {};
|
||||
|
||||
private matrix: Matrix;
|
||||
|
||||
constructor(props: IHarmonyDataProviderProps) {
|
||||
constructor(props: IHubDataProviderProps) {
|
||||
this.log = props.log;
|
||||
this.hubAddress = props.hubAddress;
|
||||
this.harmonyHubAddress = props.harmonyHubAddress;
|
||||
this.neeoHubAddress = props.neeoHubAddress;
|
||||
this.matrix = props.matrix;
|
||||
|
||||
this.harmony = new Harmony();
|
||||
|
||||
//Listeners
|
||||
this.harmony.on('open', () => {
|
||||
this.connected = true;
|
||||
});
|
||||
this.harmony.on('close', () => {
|
||||
this.connected = false;
|
||||
});
|
||||
|
||||
this.connect();
|
||||
if (this.harmonyHubAddress) {
|
||||
try {
|
||||
Promise.resolve(this.connectHarmony(this.harmonyHubAddress));
|
||||
} catch (err) {
|
||||
this.log(`Error connecting to harmony hub at ${this.harmonyHubAddress}: ${err}`);
|
||||
}
|
||||
}
|
||||
if (this.neeoHubAddress) {
|
||||
try {
|
||||
Promise.resolve(this.connectNeeo(this.neeoHubAddress));
|
||||
} catch (err) {
|
||||
this.log(`Error connecting to neeo hub at ${this.neeoHubAddress}: ${err}`)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -76,16 +87,21 @@ class HarmonyDataProvider {
|
||||
//Build potential list of devices to turn off
|
||||
let devicesToTurnOff: Array<IDevice> = this.states[controlUnitName]!.currentActivity.deviceSetupItems
|
||||
.map((value: DeviceSetupItem): IDevice => {
|
||||
return this.getDeviceFromName(value.deviceName);
|
||||
return this.getDeviceFromName(value.deviceName, value.hubType);
|
||||
});
|
||||
|
||||
//Resolve device conflicts with other controlUnits
|
||||
devicesToTurnOff = this.sanitizeDeviceList(devicesToTurnOff, controlUnitName);
|
||||
|
||||
await Promise.all(
|
||||
//Turn off devices
|
||||
devicesToTurnOff.forEach((device: IDevice) => {
|
||||
this.powerOffDevice(device);
|
||||
});
|
||||
devicesToTurnOff.map(async (device: IDevice) => {
|
||||
if (device) {
|
||||
await device.powerOff();
|
||||
}
|
||||
})
|
||||
);
|
||||
|
||||
|
||||
this.states[controlUnitName] = undefined;
|
||||
}
|
||||
@ -102,7 +118,7 @@ class HarmonyDataProvider {
|
||||
|
||||
//Build potential list of devices to to turn on
|
||||
let devicesToTurnOn: Array<IDevice> = activity.deviceSetupItems.map((value: DeviceSetupItem): IDevice => {
|
||||
return this.getDeviceFromName(value.deviceName);
|
||||
return this.getDeviceFromName(value.deviceName, value.hubType);
|
||||
});
|
||||
|
||||
//Resolve device conflicts with other controlUnits
|
||||
@ -110,10 +126,10 @@ class HarmonyDataProvider {
|
||||
|
||||
//Turn on devices
|
||||
await Promise.all(devicesToTurnOn.map(async (device: IDevice) => {
|
||||
if (device && device.name && this.devices[device.name]) {
|
||||
if (device && device.name) {
|
||||
if (!device.on) {
|
||||
this.log(`Turning on device ${device.name}`)
|
||||
await this.powerOnDevice(device);
|
||||
await device.powerOn();
|
||||
}
|
||||
}
|
||||
}));
|
||||
@ -121,11 +137,11 @@ class HarmonyDataProvider {
|
||||
//Assign correct input
|
||||
await Promise.all(
|
||||
activity.deviceSetupItems.map(async (value: DeviceSetupItem) => {
|
||||
let device: IDevice = this.getDeviceFromName(value.deviceName);
|
||||
let device: IDevice = this.getDeviceFromName(value.deviceName, value.hubType);
|
||||
|
||||
if (device && device.supportsCommand(`Input${value.input}`)) {
|
||||
let command: string = device.getCommand(`Input${value.input}`);
|
||||
await this.sendCommand(command);
|
||||
if (device && device.supportsCommand(`Input ${value.input}`)) {
|
||||
let command: string = device.getCommand(`Input ${value.input}`);
|
||||
await device.sendCommand(command);
|
||||
}
|
||||
})
|
||||
);
|
||||
@ -138,21 +154,19 @@ class HarmonyDataProvider {
|
||||
let inputCommandName: string = `In ${input.inputNumber}`;
|
||||
let outputCommandName: string = `Out ${output.outputLetter}`;
|
||||
|
||||
let matrixDevice: IDevice = this.getDeviceFromName(this.matrix.deviceName);
|
||||
let matrixDevice: IDevice = this.getDeviceFromName(this.matrix.deviceName, this.matrix.hubType);
|
||||
|
||||
//Route hdmi
|
||||
if (matrixDevice.supportsCommand(inputCommandName) && matrixDevice.supportsCommand(outputCommandName)) {
|
||||
await this.sendCommand(matrixDevice.getCommand(outputCommandName));
|
||||
await this.sendCommand(matrixDevice.getCommand(inputCommandName));
|
||||
await this.sendCommand(matrixDevice.getCommand(outputCommandName));
|
||||
await this.sendCommand(matrixDevice.getCommand(inputCommandName));
|
||||
await matrixDevice.sendCommand(matrixDevice.getCommand(inputCommandName));
|
||||
await matrixDevice.sendCommand(matrixDevice.getCommand(outputCommandName));
|
||||
}
|
||||
}
|
||||
|
||||
//Build potential list of devices to turn off
|
||||
if (lastActivity) {
|
||||
let devicesToTurnOff: Array<IDevice> = lastActivity.deviceSetupItems.map((value: DeviceSetupItem): IDevice => {
|
||||
return this.getDeviceFromName(value.deviceName);
|
||||
return this.getDeviceFromName(value.deviceName, value.hubType);
|
||||
});
|
||||
|
||||
//remove devices that will be used for next activity from list
|
||||
@ -176,7 +190,7 @@ class HarmonyDataProvider {
|
||||
if (device) {
|
||||
if (device.on) {
|
||||
this.log(`Turning off device ${device.name}`)
|
||||
await this.powerOffDevice(device);
|
||||
await device.powerOff();
|
||||
}
|
||||
}
|
||||
})
|
||||
@ -193,10 +207,13 @@ class HarmonyDataProvider {
|
||||
*/
|
||||
public volumeUp = async (controlUnitName: string) => {
|
||||
let volumeUpCommand: string = "Volume Up"
|
||||
let currentActivity: Activity = this.states[controlUnitName]!.currentActivity;
|
||||
let deviceSetupItem: DeviceSetupItem = currentActivity.deviceSetupItems.filter(e => e.deviceName == currentActivity.volumeDeviceId)[0];
|
||||
|
||||
if (this.states[controlUnitName]) {
|
||||
let volumeDevice: IDevice = this.getDeviceFromName(this.states[controlUnitName]!.currentActivity.volumeDeviceId);
|
||||
let volumeDevice: IDevice = this.getDeviceFromName(currentActivity.volumeDeviceId, deviceSetupItem.hubType);
|
||||
if (volumeDevice.supportsCommand(volumeUpCommand)) {
|
||||
this.sendCommand(volumeDevice.getCommand(volumeUpCommand));
|
||||
volumeDevice.sendCommand(volumeDevice.getCommand(volumeUpCommand));
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -206,14 +223,52 @@ class HarmonyDataProvider {
|
||||
*/
|
||||
public volumeDown = async (controlUnitName: string) => {
|
||||
let volumeDownCommand: string = "Volume Down"
|
||||
let currentActivity: Activity = this.states[controlUnitName]!.currentActivity;
|
||||
let deviceSetupItem: DeviceSetupItem = currentActivity.deviceSetupItems.filter(e => e.deviceName == currentActivity.volumeDeviceId)[0];
|
||||
|
||||
if (this.states[controlUnitName]) {
|
||||
let volumeDevice: IDevice = this.getDeviceFromName(this.states[controlUnitName]!.currentActivity.volumeDeviceId);
|
||||
let volumeDevice: IDevice = this.getDeviceFromName(currentActivity.volumeDeviceId, deviceSetupItem.hubType);
|
||||
if (volumeDevice.supportsCommand(volumeDownCommand)) {
|
||||
this.sendCommand(volumeDevice.getCommand(volumeDownCommand));
|
||||
volumeDevice.sendCommand(volumeDevice.getCommand(volumeDownCommand));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Return if a control unit is active
|
||||
* @param controlUnitName
|
||||
*/
|
||||
public getIsActive(controlUnitName: string): Activity | undefined {
|
||||
return this.states[controlUnitName] ? this.states[controlUnitName]!.currentActivity : undefined;
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper function to make sure no control unit depends on device list.
|
||||
* @param devicesToTurnOn The list of devices to modify.
|
||||
* @param controlUnitName The name of the control unit in question.
|
||||
*/
|
||||
private sanitizeDeviceList(devicesToTurnOn: Array<IDevice>, controlUnitName: string): Array<IDevice> {
|
||||
for (let controlUnitKey in this.states) {
|
||||
//Skip self
|
||||
if (controlUnitKey === controlUnitName) {
|
||||
continue;
|
||||
}
|
||||
let currentOtherState: IActivityState = this.states[controlUnitKey]!;
|
||||
|
||||
if (currentOtherState) {
|
||||
currentOtherState.currentActivity.deviceSetupItems.forEach((value: DeviceSetupItem) => {
|
||||
//there are devices to remove
|
||||
if (devicesToTurnOn.some(e => e && e.name === value.deviceName)) {
|
||||
let deviceToRemove: IDevice = devicesToTurnOn.filter(i => i.name === value.deviceName)[0];
|
||||
delete devicesToTurnOn[devicesToTurnOn.indexOf(deviceToRemove)];
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return devicesToTurnOn;
|
||||
}
|
||||
|
||||
/**
|
||||
* Send key press for current activity.
|
||||
*
|
||||
@ -224,7 +279,10 @@ class HarmonyDataProvider {
|
||||
if (this.states[controlUnitName]) {
|
||||
let commandName: string = "";
|
||||
|
||||
let device: IDevice = this.getDeviceFromName(this.states[controlUnitName]!.currentActivity.controlDeviceId);
|
||||
let currentActivity: Activity = this.states[controlUnitName]!.currentActivity;
|
||||
let deviceSetupItem: DeviceSetupItem = currentActivity.deviceSetupItems.filter(e => e.deviceName == currentActivity.volumeDeviceId)[0];
|
||||
|
||||
let device: IDevice = this.getDeviceFromName(this.states[controlUnitName]!.currentActivity.controlDeviceId, deviceSetupItem.hubType);
|
||||
switch (key) {
|
||||
case RemoteKey.ARROW_UP: {
|
||||
commandName = "Direction Up";
|
||||
@ -265,43 +323,54 @@ class HarmonyDataProvider {
|
||||
}
|
||||
|
||||
if (device && device.supportsCommand(commandName)) {
|
||||
this.sendCommand(device.getCommand(commandName));
|
||||
device.sendCommand(device.getCommand(commandName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Return if a control unit is active
|
||||
* @param controlUnitName
|
||||
* Get the IDevice by name.
|
||||
* @param deviceName The device to retrieve.
|
||||
*/
|
||||
public getIsActive(controlUnitName: string): Activity | undefined {
|
||||
return this.states[controlUnitName] ? this.states[controlUnitName]!.currentActivity : undefined;
|
||||
private getDeviceFromName(deviceName: string, hubType: hub): IDevice {
|
||||
return this.devices[`${hubType}-${deviceName}`];
|
||||
}
|
||||
|
||||
/**
|
||||
* Connect to harmony and receive device info
|
||||
* Connect to harmony hub and receive device info.
|
||||
*/
|
||||
private connect = async () => {
|
||||
await this.harmony.connect(this.hubAddress);
|
||||
private connectHarmony = async (address: string): Promise<void> => {
|
||||
let harmony: any = new Harmony();
|
||||
//Listeners
|
||||
harmony.on('open', () => {
|
||||
this.harmonyConnected = true;
|
||||
});
|
||||
harmony.on('close', () => {
|
||||
this.harmonyConnected = false;
|
||||
});
|
||||
await harmony.connect(address);
|
||||
let self = this;
|
||||
|
||||
setTimeout(async function () {
|
||||
if (self.connected) {
|
||||
let devices: any = await self.harmony.getDevices();
|
||||
if (self.harmonyConnected) {
|
||||
let devices: any = await harmony.getDevices();
|
||||
try {
|
||||
await Promise.all(
|
||||
//Add each to dictionary
|
||||
devices.map(async (dev: any) => {
|
||||
//get commands
|
||||
let commands: { [name: string]: string } = {};
|
||||
let deviceCommands: any = await self.harmony.getDeviceCommands(dev.id);
|
||||
let deviceCommands: any = await harmony.getDeviceCommands(dev.id);
|
||||
deviceCommands.forEach((command: any) => {
|
||||
commands[command.label] = command.action;
|
||||
});
|
||||
self.devices[dev.label] = {
|
||||
self.devices[`Harmony-${dev.label}`] = {
|
||||
id: dev.id,
|
||||
name: dev.label,
|
||||
commands: commands,
|
||||
harmony: harmony,
|
||||
hubType: "Harmony",
|
||||
log: self.log,
|
||||
on: false,
|
||||
//Define device methods
|
||||
supportsCommand(commandName: string): boolean {
|
||||
@ -310,6 +379,39 @@ class HarmonyDataProvider {
|
||||
},
|
||||
getCommand(commandName: string): string {
|
||||
return commands[commandName];
|
||||
},
|
||||
async powerOn(): Promise<void> {
|
||||
let powerOnCommand: string = "Power On";
|
||||
let powerToggleCommand: string = "Power Toggle";
|
||||
if (this.supportsCommand(powerOnCommand)) {
|
||||
await this.sendCommand(this.getCommand(powerOnCommand));
|
||||
this.on = true;
|
||||
} else if (this.supportsCommand(powerToggleCommand)) {
|
||||
await this.sendCommand(this.getCommand(powerToggleCommand));
|
||||
this.on = true;
|
||||
}
|
||||
},
|
||||
async powerOff(): Promise<void> {
|
||||
let powerOffCommand: string = "Power Off";
|
||||
let powerToggleCommand: string = "Power Toggle";
|
||||
if (this.supportsCommand(powerOffCommand)) {
|
||||
await this.sendCommand(this.getCommand(powerOffCommand));
|
||||
this.on = false;
|
||||
} else if (this.supportsCommand(powerToggleCommand)) {
|
||||
await this.sendCommand(this.getCommand(powerToggleCommand));
|
||||
this.on = false;
|
||||
}
|
||||
},
|
||||
async sendCommand(command: string): Promise<void> {
|
||||
try {
|
||||
//Execute command
|
||||
let response = await this.harmony.sendCommand(JSON.stringify(command));
|
||||
|
||||
//Sleep
|
||||
await sleep(800);
|
||||
} catch (err) {
|
||||
this.log(`ERROR - error sending command to harmony: ${err}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
}));
|
||||
@ -322,87 +424,85 @@ class HarmonyDataProvider {
|
||||
}, 1000);
|
||||
}
|
||||
|
||||
/**
|
||||
* Power off a device (Power toggle if no power off).
|
||||
*/
|
||||
private powerOffDevice = async (device: IDevice) => {
|
||||
let powerOffCommand: string = "Power Off";
|
||||
let powerToggleCommand: string = "Power Toggle";
|
||||
if (device && device.supportsCommand(powerOffCommand)) {
|
||||
await this.sendCommand(device.getCommand(powerOffCommand));
|
||||
device.on = false;
|
||||
} else if (device && device.supportsCommand(powerToggleCommand)) {
|
||||
await this.sendCommand(device.getCommand(powerToggleCommand));
|
||||
device.on = false;
|
||||
}
|
||||
private connectNeeo = async (address: string): Promise<void> => {
|
||||
|
||||
let baseUrl = `http://${address}:3000/v1/projects/home`;
|
||||
|
||||
let response: any = await fetch(`${baseUrl}/rooms`);
|
||||
let rooms: { [key: string]: any } = await response.json();
|
||||
|
||||
function regularizeString(str: string) {
|
||||
str = str.toLowerCase();
|
||||
return str.replace(/(?:^|\s)\S/g, function (a) { return a.toUpperCase(); });
|
||||
}
|
||||
|
||||
/**
|
||||
* Power on a device (Power toggle if no power on).
|
||||
*/
|
||||
private powerOnDevice = async (device: IDevice) => {
|
||||
for (let key in rooms) {
|
||||
let devices: { [key: string]: any } = rooms[key].devices;
|
||||
for (let deviceKey in devices) {
|
||||
let device = devices[deviceKey];
|
||||
|
||||
//shape commands from macros
|
||||
let commands: { [item: string]: any } = {};
|
||||
for (let macroKey in device.macros) {
|
||||
let macro: any = device.macros[macroKey];
|
||||
commands[regularizeString(macro.name)] = {
|
||||
deviceKey: macro.deviceKey,
|
||||
macroKey: macro.key,
|
||||
roomKey: macro.roomKey,
|
||||
};
|
||||
}
|
||||
|
||||
this.devices[`Neeo-${deviceKey}`] = {
|
||||
id: device.key,
|
||||
name: device.name,
|
||||
log: this.log,
|
||||
hubType: "Neeo",
|
||||
commands: commands,
|
||||
on: false,
|
||||
supportsCommand(commandName: string): boolean {
|
||||
let command = this.commands[commandName];
|
||||
return (command) ? true : false;
|
||||
},
|
||||
|
||||
getCommand(commandName: string): string {
|
||||
return this.commands[commandName];
|
||||
},
|
||||
|
||||
async sendCommand(command: string): Promise<void> {
|
||||
if (this.supportsCommand(command)) {
|
||||
let macro: INeeoMacro = this.commands[command];
|
||||
let url: string = `${baseUrl}/rooms/${macro.roomKey}/devices/${macro.deviceKey}/macros/${macro.macroKey}/trigger`;
|
||||
this.log(`Sending command ${url}`);
|
||||
fetch(`${baseUrl}/rooms/${macro.roomKey}/devices/${macro.deviceKey}/macros/${macro.macroKey}/trigger`);
|
||||
}
|
||||
},
|
||||
|
||||
async powerOn(): Promise<void> {
|
||||
let powerOnCommand: string = "Power On";
|
||||
let powerToggleCommand: string = "Power Toggle";
|
||||
if (device && device.supportsCommand(powerOnCommand)) {
|
||||
await this.sendCommand(device.getCommand(powerOnCommand));
|
||||
device.on = true;
|
||||
} else if (device && device.supportsCommand(powerToggleCommand)) {
|
||||
await this.sendCommand(device.getCommand(powerToggleCommand));
|
||||
device.on = true;
|
||||
if (this.supportsCommand(powerOnCommand)) {
|
||||
await this.sendCommand(powerOnCommand);
|
||||
this.on = true;
|
||||
} else if (this.supportsCommand(powerToggleCommand)) {
|
||||
await this.sendCommand(powerToggleCommand);
|
||||
this.on = true;
|
||||
}
|
||||
},
|
||||
async powerOff(): Promise<void> {
|
||||
let powerOffCommand: string = "Power Off";
|
||||
let powerToggleCommand: string = "Power Toggle";
|
||||
if (this.supportsCommand(powerOffCommand)) {
|
||||
await this.sendCommand(powerOffCommand);
|
||||
this.on = false;
|
||||
} else if (this.supportsCommand(powerToggleCommand)) {
|
||||
await this.sendCommand(powerToggleCommand);
|
||||
this.on = false;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the IDevice by name.
|
||||
* @param deviceName The device to retrieve.
|
||||
*/
|
||||
private getDeviceFromName(deviceName: string): IDevice {
|
||||
return this.devices[deviceName];
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper function to make sure no control unit depends on device list.
|
||||
* @param devicesToTurnOn The list of devices to modify.
|
||||
* @param controlUnitName The name of the control unit in question.
|
||||
*/
|
||||
private sanitizeDeviceList(devicesToTurnOn: Array<IDevice>, controlUnitName: string): Array<IDevice> {
|
||||
for (let controlUnitKey in this.states) {
|
||||
//Skip self
|
||||
if (controlUnitKey === controlUnitName) {
|
||||
continue;
|
||||
}
|
||||
let currentOtherState: IActivityState = this.states[controlUnitKey]!;
|
||||
|
||||
if (currentOtherState) {
|
||||
currentOtherState.currentActivity.deviceSetupItems.forEach((value: DeviceSetupItem) => {
|
||||
//there are devices to remove
|
||||
if (devicesToTurnOn.some(e => e && e.name === value.deviceName)) {
|
||||
let deviceToRemove: IDevice = devicesToTurnOn.filter(i => i.name === value.deviceName)[0];
|
||||
delete devicesToTurnOn[devicesToTurnOn.indexOf(deviceToRemove)];
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return devicesToTurnOn;
|
||||
}
|
||||
|
||||
/**
|
||||
* Send a command to the harmony hub.
|
||||
* @param command The command to send.
|
||||
*/
|
||||
private sendCommand = async (command: string) => {
|
||||
try {
|
||||
//Execute command
|
||||
let response = await this.harmony.sendCommand(JSON.stringify(command));
|
||||
|
||||
//Sleep
|
||||
await sleep(800);
|
||||
} catch (err) {
|
||||
this.log(`ERROR - error sending command to harmony: ${err}`);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
export default HarmonyDataProvider;
|
||||
export default HubDataProvider;
|
||||
16
src/DataProviders/IDevice.ts
Normal file
16
src/DataProviders/IDevice.ts
Normal file
@ -0,0 +1,16 @@
|
||||
import { hub } from "..";
|
||||
|
||||
export interface IDevice {
|
||||
id: string,
|
||||
name: string,
|
||||
harmony?: any,
|
||||
log: any,
|
||||
hubType: hub
|
||||
supportsCommand(commandName: string): boolean,
|
||||
getCommand(commandName: string): string,
|
||||
sendCommand(command: string): void,
|
||||
powerOn(): Promise<void>,
|
||||
powerOff(): Promise<void>,
|
||||
commands: { [name: string]: any };
|
||||
on: boolean;
|
||||
}
|
||||
@ -1,7 +1,9 @@
|
||||
import { hub } from "..";
|
||||
|
||||
export interface IDeviceSetupItemProps {
|
||||
deviceName: string,
|
||||
input: string
|
||||
input: string,
|
||||
hub: hub
|
||||
}
|
||||
|
||||
/**
|
||||
@ -10,9 +12,11 @@ export interface IDeviceSetupItemProps {
|
||||
export class DeviceSetupItem {
|
||||
private _deviceId: string = "";
|
||||
private _input: string = "";
|
||||
private _hubType: hub;
|
||||
constructor(props: IDeviceSetupItemProps) {
|
||||
this._deviceId = props.deviceName;
|
||||
this._input = props.input;
|
||||
this._hubType = props.hub;
|
||||
}
|
||||
|
||||
public get deviceName() {
|
||||
@ -22,4 +26,8 @@ export class DeviceSetupItem {
|
||||
public get input() {
|
||||
return this._input;
|
||||
}
|
||||
|
||||
public get hubType() {
|
||||
return this._hubType;
|
||||
}
|
||||
}
|
||||
@ -1,7 +1,10 @@
|
||||
import { hub } from "..";
|
||||
|
||||
export interface IMatrixProps {
|
||||
inputs: Array<Input>,
|
||||
outputs: Array<Output>,
|
||||
deviceName: string,
|
||||
hubType: hub
|
||||
}
|
||||
|
||||
export interface Input {
|
||||
@ -21,11 +24,13 @@ export class Matrix {
|
||||
private _inputs: Array<Input> = [];
|
||||
private _outputs: Array<Output> = [];
|
||||
private _deviceName: string;
|
||||
private _hubType: hub = "Harmony";
|
||||
|
||||
constructor(props: IMatrixProps) {
|
||||
this._inputs = props.inputs;
|
||||
this._outputs = props.outputs;
|
||||
this._deviceName = props.deviceName;
|
||||
this._hubType = props.hubType;
|
||||
}
|
||||
|
||||
public get inputs(): Array<Input> {
|
||||
@ -39,4 +44,8 @@ export class Matrix {
|
||||
public get deviceName(): string {
|
||||
return this._deviceName;
|
||||
}
|
||||
|
||||
public get hubType(): hub {
|
||||
return this._hubType;
|
||||
}
|
||||
}
|
||||
45
src/index.ts
45
src/index.ts
@ -2,11 +2,13 @@ import { ControlUnit } from "./Accessories/ControlUnit";
|
||||
import { Activity } from "./Models/Activity";
|
||||
import { DeviceSetupItem } from "./Models/DeviceSetupItem";
|
||||
import { Input, Output, Matrix } from "./Models/Matrix";
|
||||
import HarmonyDataProvider from "./DataProviders/HarmonyDataProvider";
|
||||
import HubDataProvider from './DataProviders/HubDataProvider';
|
||||
|
||||
let Accessory: any;
|
||||
let Homebridge: any;
|
||||
|
||||
export type hub = "Harmony" | "Neeo";
|
||||
|
||||
/**
|
||||
* Main entry.
|
||||
* @param homebridge
|
||||
@ -26,8 +28,8 @@ class HarmonyMatrixPlatform {
|
||||
log: any = {};
|
||||
config: any = {};
|
||||
api: any;
|
||||
dataProvider: HarmonyDataProvider | null;
|
||||
controlUnits: Array<ControlUnit> = [];
|
||||
externalAccessories: Array<any> = [];
|
||||
dataProvider: HubDataProvider | null;
|
||||
|
||||
constructor(log: any, config: any, api: any) {
|
||||
this.log = log;
|
||||
@ -48,7 +50,7 @@ class HarmonyMatrixPlatform {
|
||||
this.log(`Publishing external accessories`);
|
||||
|
||||
//This is required in order to have multiple tv remotes on one platform
|
||||
this.controlUnits.forEach((accessory: ControlUnit) => {
|
||||
this.externalAccessories.forEach((accessory: ControlUnit) => {
|
||||
this.api.publishExternalAccessories("HarmonyMatrixPlatform", [accessory.platformAccessory]);
|
||||
})
|
||||
|
||||
@ -60,12 +62,14 @@ class HarmonyMatrixPlatform {
|
||||
*/
|
||||
accessories(callback: (accessories: Array<ControlUnit>) => void) {
|
||||
//Parse ip
|
||||
let hubIp: string = this.config["hubIp"];
|
||||
let harmonyIp: string = this.config["harmonyHubIp"];
|
||||
let neeoIp: string = this.config["neeoHubIp"];
|
||||
|
||||
//Parse matrix
|
||||
let configInputs: any = this.config["Matrix"]["Inputs"];
|
||||
let configOutputs: any = this.config["Matrix"]["Outputs"];
|
||||
let matrixName: string = this.config["Matrix"]["DeviceName"];
|
||||
let hub: hub = this.config["Matrix"]["Hub"];
|
||||
|
||||
let inputs: Array<Input> = [];
|
||||
let outputs: Array<Output> = [];
|
||||
@ -98,18 +102,20 @@ class HarmonyMatrixPlatform {
|
||||
inputs: inputs,
|
||||
outputs: outputs,
|
||||
deviceName: matrixName,
|
||||
hubType: hub
|
||||
});
|
||||
|
||||
//construct data provider
|
||||
this.dataProvider = new HarmonyDataProvider({
|
||||
hubAddress: hubIp,
|
||||
this.dataProvider = new HubDataProvider({
|
||||
harmonyHubAddress: harmonyIp,
|
||||
neeoHubAddress: neeoIp,
|
||||
matrix: matrix,
|
||||
log: this.log
|
||||
});
|
||||
|
||||
//Parse control units
|
||||
let configControlUnits: any = this.config["ControlUnits"];
|
||||
|
||||
let controlUnits: Array<ControlUnit> = [];
|
||||
configControlUnits.forEach((configControlUnit: any) => {
|
||||
//Parse activities list
|
||||
let configActivities: any = configControlUnit["Activities"];
|
||||
@ -122,7 +128,8 @@ class HarmonyMatrixPlatform {
|
||||
//Add device
|
||||
devices.push(new DeviceSetupItem({
|
||||
deviceName: configDevice["DeviceName"],
|
||||
input: configDevice["Input"]
|
||||
input: configDevice["Input"],
|
||||
hub: configDevice["Hub"]
|
||||
}));
|
||||
this.log(`INFO - Added device '${configDevice["DeviceName"]}' for activity '${configActivity["DisplayName"]}'`);
|
||||
});
|
||||
@ -133,7 +140,7 @@ class HarmonyMatrixPlatform {
|
||||
controlDeviceId: configActivity["ControlDevice"],
|
||||
outputDeviceId: configActivity["OutputDevice"],
|
||||
displayName: configActivity["DisplayName"],
|
||||
useMatrix: configActivity["UseMatrix"] === "true" ? true : false,
|
||||
useMatrix: configActivity["UseMatrix"],
|
||||
deviceList: devices
|
||||
}));
|
||||
this.log(`INFO - Added activity '${configActivity["DisplayName"]}'`);
|
||||
@ -146,17 +153,31 @@ class HarmonyMatrixPlatform {
|
||||
log: this.log,
|
||||
activities: activities,
|
||||
homebridge: Homebridge,
|
||||
isExternal: false
|
||||
});
|
||||
|
||||
let controlUnitExternal: ControlUnit = new ControlUnit({
|
||||
dataProvider: this.dataProvider!,
|
||||
displayName: `${configControlUnit["DisplayName"]}`,
|
||||
api: this.api,
|
||||
log: this.log,
|
||||
activities: activities,
|
||||
homebridge: Homebridge,
|
||||
isExternal: true
|
||||
});
|
||||
|
||||
//@ts-ignore
|
||||
let accessory = controlUnit as homebridge.platformAccessory;
|
||||
//@ts-ignore
|
||||
let externalAccessory = controlUnitExternal as homebridge.platformAccessory;
|
||||
|
||||
//Add control unit
|
||||
this.controlUnits.push(accessory);
|
||||
controlUnits.push(accessory);
|
||||
//Add to list of remotes
|
||||
this.externalAccessories.push(externalAccessory);
|
||||
|
||||
this.log(`INFO - Added ControlUnit`);
|
||||
});
|
||||
callback(this.controlUnits);
|
||||
callback(controlUnits);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user