Skip to content

Add brightness characteristic only for supported devices #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add brightness characteristic only for supported devices #353

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e52f28
Remove unneeded conditional statement
dnicolson Oct 13, 2024
0229a99
Add brightness only for supported devices
dnicolson Oct 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 14 additions & 23 deletions src/homekit-device/plug.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,10 @@ export default class HomeKitDevicePlug extends HomekitDevice {
this.removeSwitchService();
} else if (this.category === Categories.OUTLET) {
primaryService = this.addOutletService();
this.removeBrightnessCharacteristic(primaryService);
this.removeLightbulbService();
this.removeSwitchService();
} else if (this.category === Categories.SWITCH) {
primaryService = this.addSwitchService();
this.removeBrightnessCharacteristic(primaryService);
this.removeLightbulbService();
this.removeOutletService();
} else {
Expand Down Expand Up @@ -138,21 +136,19 @@ export default class HomeKitDevicePlug extends HomekitDevice {

this.addOnCharacteristic(outletService);

if (this.category === Categories.OUTLET) {
const outletInUseCharacteristic = getOrAddCharacteristic(
outletService,
Characteristic.OutletInUse
);
const outletInUseCharacteristic = getOrAddCharacteristic(
outletService,
Characteristic.OutletInUse
);

outletInUseCharacteristic.onGet(() => {
this.getSysInfo().catch(this.logRejection.bind(this)); // this will eventually trigger update
return this.tplinkDevice.inUse; // immediately returned cached value
});
outletInUseCharacteristic.onGet(() => {
this.getSysInfo().catch(this.logRejection.bind(this)); // this will eventually trigger update
return this.tplinkDevice.inUse; // immediately returned cached value
});

this.tplinkDevice.on('in-use-update', (value) => {
this.updateValue(outletService, outletInUseCharacteristic, value);
});
}
this.tplinkDevice.on('in-use-update', (value) => {
this.updateValue(outletService, outletInUseCharacteristic, value);
});

return outletService;
}
Expand Down Expand Up @@ -218,7 +214,9 @@ export default class HomeKitDevicePlug extends HomekitDevice {
this.updateValue(service, onCharacteristic, value);
});

this.addBrightnessCharacteristic(service);
if (this.tplinkDevice.supportsDimmer) {
this.addBrightnessCharacteristic(service);
}

return service;
}
Expand Down Expand Up @@ -254,13 +252,6 @@ export default class HomeKitDevicePlug extends HomekitDevice {
return service;
}

private removeBrightnessCharacteristic(service: Service) {
this.removeCharacteristicIfExists(
service,
this.platform.Characteristic.Brightness
);
}

private addEnergyCharacteristics(service: Service): void {
const { Amperes, KilowattHours, VoltAmperes, Volts, Watts } =
this.platform.customCharacteristics;
Expand Down