Skip to content
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

Jump to bottom

Update target temperature in the home app and get temperature/humidity data for hub 2 #779

Merged
merged 6 commits into from
Jul 29, 2023
Merged

Update target temperature in the home app and get temperature/humidity data for hub 2 #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
49cee06
fix formatting
mrlt8 Jul 28, 2023
309cdc8
ThresholdTemperature as target temp #389 #761
mrlt8 Jul 28, 2023
ce0240d
fix typos
mrlt8 Jul 28, 2023
2573646
refactor
mrlt8 Jul 28, 2023
148af5f
Get temp/humidity from Service Characteristic #761
mrlt8 Jul 29, 2023
7756fea
Update temp/humidity on hub #761 #777
mrlt8 Jul 29, 2023
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
34 changes: 23 additions & 11 deletions src/device/hub.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Context } from 'vm';
import { CharacteristicValue, PlatformAccessory, Service } from 'homebridge';
import { interval } from 'rxjs';
import { request } from 'undici';
import { sleep } from '../utils';
import { Context } from 'vm';
import { SwitchBotPlatform } from '../platform';
import { device, devicesConfig, Devices } from '../settings';
import { Service, PlatformAccessory, CharacteristicValue } from 'homebridge';
import { Devices, device, devicesConfig } from '../settings';
import { sleep } from '../utils';

export class Hub {
// Services
Expand Down Expand Up @@ -56,11 +56,11 @@ export class Hub {
// you can create multiple services for each accessory
(this.hubTemperatureSensor =
accessory.getService(this.platform.Service.TemperatureSensor) || accessory.addService(this.platform.Service.TemperatureSensor)),
`${device.deviceName} ${device.deviceType}`;
`${device.deviceName} ${device.deviceType}`;

(this.hubHumiditySensor =
accessory.getService(this.platform.Service.HumiditySensor) || accessory.addService(this.platform.Service.HumiditySensor)),
`${device.deviceName} ${device.deviceType}`;
`${device.deviceName} ${device.deviceType}`;

// To avoid "Cannot add a Service with the same UUID another Service without also defining a unique 'subtype' property." error,
// when creating multiple services of the same type, you need to use the following syntax to specify a name and subtype id:
Expand Down Expand Up @@ -92,7 +92,7 @@ export class Hub {
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Humidity Sensor Service`);
(this.hubHumiditySensor =
accessory.getService(this.platform.Service.HumiditySensor) || accessory.addService(this.platform.Service.HumiditySensor)),
`${device.deviceName} ${device.deviceType}`;
`${device.deviceName} ${device.deviceType}`;

this.hubHumiditySensor.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Humidity Sensor`);
this.hubHumiditySensor.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Humidity Sensor`);
Expand All @@ -109,7 +109,7 @@ export class Hub {
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Temperature Sensor Service`);
(this.hubTemperatureSensor =
accessory.getService(this.platform.Service.TemperatureSensor) || accessory.addService(this.platform.Service.TemperatureSensor)),
`${device.deviceName} ${device.deviceType}`;
`${device.deviceName} ${device.deviceType}`;

this.hubTemperatureSensor.setCharacteristic(this.platform.Characteristic.Name, `${accessory.displayName} Temperature Sensor`);
this.hubTemperatureSensor.setCharacteristic(this.platform.Characteristic.ConfiguredName, `${accessory.displayName} Temperature Sensor`);
Expand Down Expand Up @@ -207,9 +207,21 @@ export class Hub {
*/

async updateHomeKitCharacteristics(): Promise<void> {
this.hubHumiditySensor?.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, this.CurrentRelativeHumidity);
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
this.hubTemperatureSensor?.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.CurrentTemperature);
if (this.CurrentRelativeHumidity === undefined) {
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
} else {
this.accessory.context.CurrentRelativeHumidity = this.CurrentRelativeHumidity;
this.hubHumiditySensor?.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, this.CurrentRelativeHumidity);
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
}

if (this.CurrentTemperature === undefined) {
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
} else {
this.accessory.context.CurrentTemperature = this.CurrentTemperature;
this.hubTemperatureSensor?.updateCharacteristic(this.platform.Characteristic.CurrentTemperature, this.CurrentTemperature);
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic CurrentTemperature: ${this.CurrentTemperature}`);
}
}

async statusCode(statusCode: number): Promise<void> {
Expand Down
Loading
Loading