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

Fix for devices without output

Browse source
This commit is contained in:
Victor Hagelbäck 2021-04-28 20:07:53 +02:00
parent a633ffacb3
commit 36e5c62b4f
1 changed files with 37 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

67
plejd/PlejdApi.js
View file

@ -326,42 +326,49 @@ class PlejdApi {
);
}
const deviceOutput = outputSettings ? outputSettings.output : 0;
const bleOutputAddress = this.siteDetails.outputAddress[device.deviceId][deviceOutput];
const outputAddress = this.siteDetails.outputAddress[device.deviceId];
if (device.traits === TRAITS.NO_LOAD) {
logger.warn(
`Device ${device.title} (${device.deviceId}) has no load configured and will be excluded`,
);
} else {
const uniqueOutputId = this.deviceRegistry.getUniqueOutputId(device.deviceId, deviceOutput);
if (outputAddress) {
const bleOutputAddress = outputAddress[deviceOutput];
const plejdDevice = this.siteDetails.plejdDevices.find(
(x) => x.deviceId === device.deviceId,
);
if (device.traits === TRAITS.NO_LOAD) {
logger.warn(
`Device ${device.title} (${device.deviceId}) has no load configured and will be excluded`,
);
} else {
const uniqueOutputId = this.deviceRegistry.getUniqueOutputId(
device.deviceId,
deviceOutput,
);
const dimmable = device.traits === TRAITS.DIMMABLE;
// dimmable = settings.dimCurve !== 'NonDimmable';
const plejdDevice = this.siteDetails.plejdDevices.find(
(x) => x.deviceId === device.deviceId,
);
const { name: typeName, type } = this._getDeviceType(plejdDevice);
const dimmable = device.traits === TRAITS.DIMMABLE;
// dimmable = settings.dimCurve !== 'NonDimmable';
/** @type {import('types/DeviceRegistry').OutputDevice} */
const outputDevice = {
bleOutputAddress,
deviceId: device.deviceId,
dimmable,
hiddenFromRoomList: device.hiddenFromRoomList,
hiddenFromIntegrations: device.hiddenFromIntegrations,
name: device.title,
output: deviceOutput,
roomId: device.roomId,
state: undefined,
type,
typeName,
version: plejdDevice.firmware.version,
uniqueId: uniqueOutputId,
};
const { name: typeName, type } = this._getDeviceType(plejdDevice);
this.deviceRegistry.addOutputDevice(outputDevice);
/** @type {import('types/DeviceRegistry').OutputDevice} */
const outputDevice = {
bleOutputAddress,
deviceId: device.deviceId,
dimmable,
hiddenFromRoomList: device.hiddenFromRoomList,
hiddenFromIntegrations: device.hiddenFromIntegrations,
name: device.title,
output: deviceOutput,
roomId: device.roomId,
state: undefined,
type,
typeName,
version: plejdDevice.firmware.version,
uniqueId: uniqueOutputId,
};
this.deviceRegistry.addOutputDevice(outputDevice);
}
}
// What should we do with inputs?!