@switchbot/homebridge-switchbot 3.5.0-beta.7 → 3.5.0-beta.70
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.vscode/settings.json +4 -1
- package/CHANGELOG.md +4 -1
- package/config.schema.json +120 -17
- package/dist/device/blindtilt.d.ts +23 -96
- package/dist/device/blindtilt.d.ts.map +1 -1
- package/dist/device/blindtilt.js +425 -778
- package/dist/device/blindtilt.js.map +1 -1
- package/dist/device/bot.d.ts +26 -72
- package/dist/device/bot.d.ts.map +1 -1
- package/dist/device/bot.js +803 -837
- package/dist/device/bot.js.map +1 -1
- package/dist/device/ceilinglight.d.ts +14 -68
- package/dist/device/ceilinglight.d.ts.map +1 -1
- package/dist/device/ceilinglight.js +241 -606
- package/dist/device/ceilinglight.js.map +1 -1
- package/dist/device/colorbulb.d.ts +14 -75
- package/dist/device/colorbulb.d.ts.map +1 -1
- package/dist/device/colorbulb.js +283 -658
- package/dist/device/colorbulb.js.map +1 -1
- package/dist/device/contact.d.ts +15 -66
- package/dist/device/contact.d.ts.map +1 -1
- package/dist/device/contact.js +254 -545
- package/dist/device/contact.js.map +1 -1
- package/dist/device/curtain.d.ts +19 -88
- package/dist/device/curtain.d.ts.map +1 -1
- package/dist/device/curtain.js +412 -806
- package/dist/device/curtain.js.map +1 -1
- package/dist/device/device.d.ts +59 -0
- package/dist/device/device.d.ts.map +1 -0
- package/dist/device/device.js +711 -0
- package/dist/device/device.js.map +1 -0
- package/dist/device/fan.d.ts +51 -0
- package/dist/device/fan.d.ts.map +1 -0
- package/dist/device/fan.js +540 -0
- package/dist/device/fan.js.map +1 -0
- package/dist/device/hub.d.ts +16 -60
- package/dist/device/hub.d.ts.map +1 -1
- package/dist/device/hub.js +261 -616
- package/dist/device/hub.js.map +1 -1
- package/dist/device/humidifier.d.ts +11 -66
- package/dist/device/humidifier.d.ts.map +1 -1
- package/dist/device/humidifier.js +240 -594
- package/dist/device/humidifier.js.map +1 -1
- package/dist/device/iosensor.d.ts +11 -64
- package/dist/device/iosensor.d.ts.map +1 -1
- package/dist/device/iosensor.js +196 -600
- package/dist/device/iosensor.js.map +1 -1
- package/dist/device/lightstrip.d.ts +11 -69
- package/dist/device/lightstrip.d.ts.map +1 -1
- package/dist/device/lightstrip.js +281 -586
- package/dist/device/lightstrip.js.map +1 -1
- package/dist/device/lock.d.ts +16 -63
- package/dist/device/lock.d.ts.map +1 -1
- package/dist/device/lock.js +252 -560
- package/dist/device/lock.js.map +1 -1
- package/dist/device/meter.d.ts +14 -64
- package/dist/device/meter.d.ts.map +1 -1
- package/dist/device/meter.js +191 -593
- package/dist/device/meter.js.map +1 -1
- package/dist/device/meterplus.d.ts +14 -65
- package/dist/device/meterplus.d.ts.map +1 -1
- package/dist/device/meterplus.js +180 -593
- package/dist/device/meterplus.js.map +1 -1
- package/dist/device/motion.d.ts +13 -69
- package/dist/device/motion.d.ts.map +1 -1
- package/dist/device/motion.js +188 -532
- package/dist/device/motion.js.map +1 -1
- package/dist/device/plug.d.ts +9 -57
- package/dist/device/plug.d.ts.map +1 -1
- package/dist/device/plug.js +96 -458
- package/dist/device/plug.js.map +1 -1
- package/dist/device/robotvacuumcleaner.d.ts +12 -63
- package/dist/device/robotvacuumcleaner.d.ts.map +1 -1
- package/dist/device/robotvacuumcleaner.js +202 -521
- package/dist/device/robotvacuumcleaner.js.map +1 -1
- package/dist/device/waterdetector.d.ts +10 -63
- package/dist/device/waterdetector.d.ts.map +1 -1
- package/dist/device/waterdetector.js +146 -475
- package/dist/device/waterdetector.js.map +1 -1
- package/dist/homebridge-ui/public/index.html +22 -16
- package/dist/homebridge-ui/server.js +1 -1
- package/dist/homebridge-ui/server.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/irdevice/airconditioner.d.ts +10 -50
- package/dist/irdevice/airconditioner.d.ts.map +1 -1
- package/dist/irdevice/airconditioner.js +324 -452
- package/dist/irdevice/airconditioner.js.map +1 -1
- package/dist/irdevice/airpurifier.d.ts +8 -39
- package/dist/irdevice/airpurifier.d.ts.map +1 -1
- package/dist/irdevice/airpurifier.js +93 -307
- package/dist/irdevice/airpurifier.js.map +1 -1
- package/dist/irdevice/camera.d.ts +7 -36
- package/dist/irdevice/camera.d.ts.map +1 -1
- package/dist/irdevice/camera.js +39 -281
- package/dist/irdevice/camera.js.map +1 -1
- package/dist/irdevice/fan.d.ts +10 -43
- package/dist/irdevice/fan.d.ts.map +1 -1
- package/dist/irdevice/fan.js +113 -341
- package/dist/irdevice/fan.js.map +1 -1
- package/dist/irdevice/irdevice.d.ts +40 -0
- package/dist/irdevice/irdevice.d.ts.map +1 -0
- package/dist/irdevice/irdevice.js +330 -0
- package/dist/irdevice/irdevice.js.map +1 -0
- package/dist/irdevice/light.d.ts +12 -45
- package/dist/irdevice/light.d.ts.map +1 -1
- package/dist/irdevice/light.js +118 -362
- package/dist/irdevice/light.js.map +1 -1
- package/dist/irdevice/other.d.ts +19 -48
- package/dist/irdevice/other.d.ts.map +1 -1
- package/dist/irdevice/other.js +438 -570
- package/dist/irdevice/other.js.map +1 -1
- package/dist/irdevice/tv.d.ts +8 -40
- package/dist/irdevice/tv.d.ts.map +1 -1
- package/dist/irdevice/tv.js +87 -335
- package/dist/irdevice/tv.js.map +1 -1
- package/dist/irdevice/vacuumcleaner.d.ts +7 -36
- package/dist/irdevice/vacuumcleaner.d.ts.map +1 -1
- package/dist/irdevice/vacuumcleaner.js +45 -285
- package/dist/irdevice/vacuumcleaner.js.map +1 -1
- package/dist/irdevice/waterheater.d.ts +7 -36
- package/dist/irdevice/waterheater.d.ts.map +1 -1
- package/dist/irdevice/waterheater.js +47 -291
- package/dist/irdevice/waterheater.js.map +1 -1
- package/dist/platform.d.ts +19 -6
- package/dist/platform.d.ts.map +1 -1
- package/dist/platform.js +310 -172
- package/dist/platform.js.map +1 -1
- package/dist/settings.d.ts +62 -19
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +16 -552
- package/dist/settings.js.map +1 -1
- package/dist/utils.d.ts +77 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +638 -1
- package/dist/utils.js.map +1 -1
- package/eslint.config.js +96 -0
- package/package.json +19 -15
- package/src/custom.d.ts +2 -1
- package/src/device/blindtilt.ts +462 -817
- package/src/device/bot.ts +862 -931
- package/src/device/ceilinglight.ts +259 -633
- package/src/device/colorbulb.ts +300 -688
- package/src/device/contact.ts +288 -571
- package/src/device/curtain.ts +441 -838
- package/src/device/device.ts +734 -0
- package/src/device/fan.ts +596 -0
- package/src/device/hub.ts +299 -645
- package/src/device/humidifier.ts +274 -647
- package/src/device/iosensor.ts +233 -626
- package/src/device/lightstrip.ts +309 -620
- package/src/device/lock.ts +292 -601
- package/src/device/meter.ts +228 -619
- package/src/device/meterplus.ts +216 -619
- package/src/device/motion.ts +218 -559
- package/src/device/plug.ts +111 -490
- package/src/device/robotvacuumcleaner.ts +228 -550
- package/src/device/waterdetector.ts +169 -501
- package/src/homebridge-ui/public/index.html +22 -16
- package/src/homebridge-ui/server.ts +1 -1
- package/src/index.ts +4 -3
- package/src/irdevice/airconditioner.ts +350 -477
- package/src/irdevice/airpurifier.ts +120 -330
- package/src/irdevice/camera.ts +53 -301
- package/src/irdevice/fan.ts +130 -360
- package/src/irdevice/irdevice.ts +346 -0
- package/src/irdevice/light.ts +157 -412
- package/src/irdevice/other.ts +507 -648
- package/src/irdevice/tv.ts +117 -367
- package/src/irdevice/vacuumcleaner.ts +59 -311
- package/src/irdevice/waterheater.ts +61 -320
- package/src/platform.ts +355 -219
- package/src/settings.ts +116 -611
- package/src/utils.ts +642 -1
- package/src/device/waterdetector.json +0 -11
package/dist/device/meter.js
CHANGED
|
@@ -1,97 +1,63 @@
|
|
|
1
|
-
import asyncmqtt from 'async-mqtt';
|
|
2
|
-
import { hostname } from 'os';
|
|
3
|
-
import { interval } from 'rxjs';
|
|
4
|
-
import { request } from 'undici';
|
|
5
1
|
import { Devices } from '../settings.js';
|
|
6
|
-
import {
|
|
7
|
-
|
|
2
|
+
import { deviceBase } from './device.js';
|
|
3
|
+
import { convertUnits } from '../utils.js';
|
|
4
|
+
import { Subject, interval, skipWhile } from 'rxjs';
|
|
5
|
+
export class Meter extends deviceBase {
|
|
8
6
|
platform;
|
|
9
|
-
accessory;
|
|
10
|
-
device;
|
|
11
|
-
api;
|
|
12
|
-
log;
|
|
13
|
-
config;
|
|
14
|
-
hap;
|
|
15
7
|
// Services
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
//
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
StatusLowBattery;
|
|
23
|
-
CurrentTemperature;
|
|
24
|
-
CurrentRelativeHumidity;
|
|
25
|
-
// OpenAPI Status
|
|
26
|
-
OpenAPI_BatteryLevel;
|
|
27
|
-
OpenAPI_FirmwareRevision;
|
|
28
|
-
OpenAPI_CurrentTemperature;
|
|
29
|
-
OpenAPI_CurrentRelativeHumidity;
|
|
30
|
-
// BLE Status
|
|
31
|
-
BLE_Celsius;
|
|
32
|
-
BLE_Fahrenheit;
|
|
33
|
-
BLE_BatteryLevel;
|
|
34
|
-
BLE_CurrentTemperature;
|
|
35
|
-
BLE_CurrentRelativeHumidity;
|
|
36
|
-
// BLE Others
|
|
37
|
-
BLE_IsConnected;
|
|
38
|
-
//MQTT stuff
|
|
39
|
-
mqttClient = null;
|
|
40
|
-
// EVE history service handler
|
|
41
|
-
historyService;
|
|
42
|
-
// Config
|
|
43
|
-
scanDuration;
|
|
44
|
-
deviceLogging;
|
|
45
|
-
deviceRefreshRate;
|
|
46
|
-
// Connection
|
|
47
|
-
OpenAPI;
|
|
48
|
-
BLE;
|
|
8
|
+
Battery;
|
|
9
|
+
HumiditySensor;
|
|
10
|
+
TemperatureSensor;
|
|
11
|
+
// Updates
|
|
12
|
+
meterUpdateInProgress;
|
|
13
|
+
doMeterUpdate;
|
|
49
14
|
constructor(platform, accessory, device) {
|
|
15
|
+
super(platform, accessory, device);
|
|
50
16
|
this.platform = platform;
|
|
51
|
-
this
|
|
52
|
-
this.
|
|
53
|
-
this.
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
this.
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
this.
|
|
63
|
-
|
|
64
|
-
this.
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
this.
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
.setCharacteristic(this.hap.Characteristic.SerialNumber, device.deviceId)
|
|
78
|
-
.setCharacteristic(this.hap.Characteristic.FirmwareRevision, accessory.context.FirmwareRevision);
|
|
79
|
-
// Temperature Sensor Service
|
|
17
|
+
// this is subject we use to track when we need to POST changes to the SwitchBot API
|
|
18
|
+
this.doMeterUpdate = new Subject();
|
|
19
|
+
this.meterUpdateInProgress = false;
|
|
20
|
+
// Initialize Battery Service
|
|
21
|
+
accessory.context.Battery = accessory.context.Battery ?? {};
|
|
22
|
+
this.Battery = {
|
|
23
|
+
Name: accessory.context.Battery.Name ?? `${accessory.displayName} Battery`,
|
|
24
|
+
Service: accessory.getService(this.hap.Service.Battery) ?? accessory.addService(this.hap.Service.Battery),
|
|
25
|
+
BatteryLevel: accessory.context.BatteryLevel ?? 100,
|
|
26
|
+
StatusLowBattery: accessory.context.StatusLowBattery ?? this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL,
|
|
27
|
+
};
|
|
28
|
+
accessory.context.Battery = this.Battery;
|
|
29
|
+
// Initialize Battery Characteristics
|
|
30
|
+
this.Battery.Service
|
|
31
|
+
.setCharacteristic(this.hap.Characteristic.Name, this.Battery.Name)
|
|
32
|
+
.setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE)
|
|
33
|
+
.getCharacteristic(this.hap.Characteristic.BatteryLevel)
|
|
34
|
+
.onGet(() => {
|
|
35
|
+
return this.Battery.BatteryLevel;
|
|
36
|
+
});
|
|
37
|
+
this.Battery.Service
|
|
38
|
+
.getCharacteristic(this.hap.Characteristic.StatusLowBattery)
|
|
39
|
+
.onGet(() => {
|
|
40
|
+
return this.Battery.StatusLowBattery;
|
|
41
|
+
});
|
|
42
|
+
// Initialize Temperature Sensor Service
|
|
80
43
|
if (device.meter?.hide_temperature) {
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
else if (!this.temperatureService) {
|
|
86
|
-
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Temperature Sensor Service`);
|
|
87
|
-
const temperatureService = `${accessory.displayName} Temperature Sensor`;
|
|
88
|
-
(this.temperatureService = this.accessory.getService(this.hap.Service.TemperatureSensor)
|
|
89
|
-
|| this.accessory.addService(this.hap.Service.TemperatureSensor)), temperatureService;
|
|
90
|
-
this.temperatureService.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Temperature Sensor`);
|
|
91
|
-
if (!this.temperatureService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
|
|
92
|
-
this.temperatureService.addCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Temperature Sensor`);
|
|
44
|
+
if (this.TemperatureSensor) {
|
|
45
|
+
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Temperature Sensor Service`);
|
|
46
|
+
this.TemperatureSensor.Service = this.accessory.getService(this.hap.Service.TemperatureSensor);
|
|
47
|
+
accessory.removeService(this.TemperatureSensor.Service);
|
|
93
48
|
}
|
|
94
|
-
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
accessory.context.TemperatureSensor = accessory.context.TemperatureSensor ?? {};
|
|
52
|
+
this.TemperatureSensor = {
|
|
53
|
+
Name: accessory.context.TemperatureSensor.Name ?? `${accessory.displayName} Temperature Sensor`,
|
|
54
|
+
Service: accessory.getService(this.hap.Service.TemperatureSensor) ?? this.accessory.addService(this.hap.Service.TemperatureSensor),
|
|
55
|
+
CurrentTemperature: accessory.context.CurrentTemperature ?? 30,
|
|
56
|
+
};
|
|
57
|
+
accessory.context.TemperatureSensor = this.TemperatureSensor;
|
|
58
|
+
// Initialize Temperature Sensor Characteristics
|
|
59
|
+
this.TemperatureSensor.Service
|
|
60
|
+
.setCharacteristic(this.hap.Characteristic.Name, this.TemperatureSensor.Name)
|
|
95
61
|
.getCharacteristic(this.hap.Characteristic.CurrentTemperature)
|
|
96
62
|
.setProps({
|
|
97
63
|
unit: "celsius" /* Units['CELSIUS'] */,
|
|
@@ -101,72 +67,70 @@ export class Meter {
|
|
|
101
67
|
minStep: 0.1,
|
|
102
68
|
})
|
|
103
69
|
.onGet(() => {
|
|
104
|
-
return this.CurrentTemperature;
|
|
70
|
+
return this.TemperatureSensor.CurrentTemperature;
|
|
105
71
|
});
|
|
106
72
|
}
|
|
107
|
-
|
|
108
|
-
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Temperature Sensor Service Not Added`);
|
|
109
|
-
}
|
|
110
|
-
// Humidity Sensor Service
|
|
73
|
+
// Initialize Humidity Sensor Service
|
|
111
74
|
if (device.meter?.hide_humidity) {
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
else if (!this.humidityService) {
|
|
117
|
-
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Add Humidity Sensor Service`);
|
|
118
|
-
const humidityService = `${accessory.displayName} Humidity Sensor`;
|
|
119
|
-
(this.humidityService = this.accessory.getService(this.hap.Service.HumiditySensor)
|
|
120
|
-
|| this.accessory.addService(this.hap.Service.HumiditySensor)), humidityService;
|
|
121
|
-
this.humidityService.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Humidity Sensor`);
|
|
122
|
-
if (!this.humidityService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
|
|
123
|
-
this.humidityService.addCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Humidity Sensor`);
|
|
75
|
+
if (this.HumiditySensor) {
|
|
76
|
+
this.debugLog(`${this.device.deviceType}: ${accessory.displayName} Removing Humidity Sensor Service`);
|
|
77
|
+
this.HumiditySensor.Service = this.accessory.getService(this.hap.Service.HumiditySensor);
|
|
78
|
+
accessory.removeService(this.HumiditySensor.Service);
|
|
124
79
|
}
|
|
125
|
-
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
accessory.context.HumiditySensor = accessory.context.HumiditySensor ?? {};
|
|
83
|
+
this.HumiditySensor = {
|
|
84
|
+
Name: accessory.context.HumiditySensorName ?? `${accessory.displayName} Humidity Sensor`,
|
|
85
|
+
Service: accessory.getService(this.hap.Service.HumiditySensor) ?? this.accessory.addService(this.hap.Service.HumiditySensor),
|
|
86
|
+
CurrentRelativeHumidity: accessory.context.CurrentRelativeHumidity ?? 50,
|
|
87
|
+
};
|
|
88
|
+
accessory.context.HumiditySensor = this.HumiditySensor;
|
|
89
|
+
// Initialize Humidity Sensor Characteristics
|
|
90
|
+
this.HumiditySensor.Service
|
|
91
|
+
.setCharacteristic(this.hap.Characteristic.Name, this.HumiditySensor.Name)
|
|
126
92
|
.getCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity)
|
|
127
93
|
.setProps({
|
|
128
94
|
minStep: 0.1,
|
|
129
95
|
})
|
|
130
96
|
.onGet(() => {
|
|
131
|
-
return this.CurrentRelativeHumidity;
|
|
97
|
+
return this.HumiditySensor.CurrentRelativeHumidity;
|
|
132
98
|
});
|
|
133
99
|
}
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
}
|
|
137
|
-
// Battery Service
|
|
138
|
-
const batteryService = `${accessory.displayName} Battery`;
|
|
139
|
-
(this.batteryService = this.accessory.getService(this.hap.Service.Battery)
|
|
140
|
-
|| accessory.addService(this.hap.Service.Battery)), batteryService;
|
|
141
|
-
this.batteryService.setCharacteristic(this.hap.Characteristic.Name, `${accessory.displayName} Battery`);
|
|
142
|
-
if (!this.batteryService.testCharacteristic(this.hap.Characteristic.ConfiguredName)) {
|
|
143
|
-
this.batteryService.addCharacteristic(this.hap.Characteristic.ConfiguredName, `${accessory.displayName} Battery`);
|
|
144
|
-
}
|
|
145
|
-
this.batteryService.setCharacteristic(this.hap.Characteristic.ChargingState, this.hap.Characteristic.ChargingState.NOT_CHARGEABLE);
|
|
100
|
+
// Retrieve initial values and updateHomekit
|
|
101
|
+
this.refreshStatus();
|
|
146
102
|
// Retrieve initial values and update Homekit
|
|
147
103
|
this.updateHomeKitCharacteristics();
|
|
148
104
|
// Start an update interval
|
|
149
105
|
interval(this.deviceRefreshRate * 1000)
|
|
106
|
+
.pipe(skipWhile(() => this.meterUpdateInProgress))
|
|
150
107
|
.subscribe(async () => {
|
|
151
108
|
await this.refreshStatus();
|
|
152
109
|
});
|
|
153
110
|
//regisiter webhook event handler
|
|
154
|
-
if (
|
|
155
|
-
this.
|
|
111
|
+
if (device.webhook) {
|
|
112
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
|
|
156
113
|
this.platform.webhookEventHandler[this.device.deviceId] = async (context) => {
|
|
157
114
|
try {
|
|
158
115
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
`current:(${CurrentTemperature}, ${CurrentRelativeHumidity})`);
|
|
166
|
-
this.CurrentRelativeHumidity = humidity;
|
|
167
|
-
this.CurrentTemperature = temperature;
|
|
168
|
-
this.updateHomeKitCharacteristics();
|
|
116
|
+
const { temperature, humidity } = context;
|
|
117
|
+
const { CurrentTemperature } = this.TemperatureSensor || { CurrentTemperature: undefined };
|
|
118
|
+
const { CurrentRelativeHumidity } = this.HumiditySensor || { CurrentRelativeHumidity: undefined };
|
|
119
|
+
if (context.scale !== 'CELCIUS' && device.meter?.convertUnitTo === undefined) {
|
|
120
|
+
this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook scale: `
|
|
121
|
+
+ `${context.scale}, instead of CELCIUS. Use the *convertUnitsTo* config under Meter settings, if displaying incorrectly in HomeKit.`);
|
|
169
122
|
}
|
|
123
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
|
|
124
|
+
'(scale, temperature, humidity) = '
|
|
125
|
+
+ `Webhook:(${context.scale}, ${convertUnits(temperature, context.scale, device.meter?.convertUnitTo)}, ${humidity}), `
|
|
126
|
+
+ `current:(${CurrentTemperature}, ${CurrentRelativeHumidity})`);
|
|
127
|
+
if (this.device.meter?.hide_humidity) {
|
|
128
|
+
this.HumiditySensor.CurrentRelativeHumidity = humidity;
|
|
129
|
+
}
|
|
130
|
+
if (this.device.meter?.hide_temperature) {
|
|
131
|
+
this.TemperatureSensor.CurrentTemperature = convertUnits(temperature, context.scale, device.meter?.convertUnitTo);
|
|
132
|
+
}
|
|
133
|
+
this.updateHomeKitCharacteristics();
|
|
170
134
|
}
|
|
171
135
|
catch (e) {
|
|
172
136
|
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
@@ -175,84 +139,68 @@ export class Meter {
|
|
|
175
139
|
};
|
|
176
140
|
}
|
|
177
141
|
}
|
|
178
|
-
|
|
179
|
-
* Parse the device status from the SwitchBot api
|
|
180
|
-
*/
|
|
181
|
-
async parseStatus() {
|
|
182
|
-
if (!this.device.enableCloudService && this.OpenAPI) {
|
|
183
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} parseStatus enableCloudService: ${this.device.enableCloudService}`);
|
|
184
|
-
}
|
|
185
|
-
else if (this.BLE) {
|
|
186
|
-
await this.BLEparseStatus();
|
|
187
|
-
}
|
|
188
|
-
else if (this.OpenAPI && this.platform.config.credentials?.token) {
|
|
189
|
-
await this.openAPIparseStatus();
|
|
190
|
-
}
|
|
191
|
-
else {
|
|
192
|
-
await this.offlineOff();
|
|
193
|
-
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:` + ` ${this.device.connectionType}, parseStatus will not happen.`);
|
|
194
|
-
}
|
|
195
|
-
}
|
|
196
|
-
async BLEparseStatus() {
|
|
142
|
+
async BLEparseStatus(serviceData) {
|
|
197
143
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
|
|
198
144
|
// BatteryLevel
|
|
199
|
-
this.BatteryLevel = Number(
|
|
200
|
-
if (this.BatteryLevel < 15) {
|
|
201
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
|
|
145
|
+
this.Battery.BatteryLevel = Number(serviceData.battery);
|
|
146
|
+
if (this.Battery.BatteryLevel < 15) {
|
|
147
|
+
this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
|
|
202
148
|
}
|
|
203
149
|
else {
|
|
204
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
150
|
+
this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
205
151
|
}
|
|
206
|
-
this.debugLog(`${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}, StatusLowBattery: ${this.StatusLowBattery}`);
|
|
152
|
+
this.debugLog(`${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}, StatusLowBattery: ${this.Battery.StatusLowBattery}`);
|
|
207
153
|
// CurrentRelativeHumidity
|
|
208
154
|
if (!this.device.meter?.hide_humidity) {
|
|
209
|
-
this.CurrentRelativeHumidity =
|
|
210
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Humidity: ${this.CurrentRelativeHumidity}%`);
|
|
155
|
+
this.HumiditySensor.CurrentRelativeHumidity = serviceData.humidity;
|
|
156
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Humidity: ${this.HumiditySensor.CurrentRelativeHumidity}%`);
|
|
211
157
|
}
|
|
212
158
|
// CurrentTemperature
|
|
213
159
|
if (!this.device.meter?.hide_temperature) {
|
|
214
|
-
|
|
215
|
-
this.CurrentTemperature =
|
|
216
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Temperature: ${this.CurrentTemperature}°c`);
|
|
160
|
+
serviceData.temperature.c < 0 ? 0 : serviceData.temperature.c > 100 ? 100 : serviceData.temperature.c;
|
|
161
|
+
this.TemperatureSensor.CurrentTemperature = serviceData.temperature.c;
|
|
162
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Temperature: ${this.TemperatureSensor.CurrentTemperature}°c`);
|
|
217
163
|
}
|
|
218
164
|
}
|
|
219
|
-
async openAPIparseStatus() {
|
|
165
|
+
async openAPIparseStatus(deviceStatus) {
|
|
220
166
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
|
|
221
|
-
//
|
|
222
|
-
this.BatteryLevel = Number(
|
|
223
|
-
if (this.BatteryLevel <
|
|
224
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
|
|
167
|
+
// Battery
|
|
168
|
+
this.Battery.BatteryLevel = Number(deviceStatus.body.battery);
|
|
169
|
+
if (this.Battery.BatteryLevel < 10) {
|
|
170
|
+
this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
|
|
225
171
|
}
|
|
226
172
|
else {
|
|
227
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
173
|
+
this.Battery.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
174
|
+
}
|
|
175
|
+
if (Number.isNaN(this.Battery.BatteryLevel)) {
|
|
176
|
+
this.Battery.BatteryLevel = 100;
|
|
228
177
|
}
|
|
229
|
-
this.debugLog(`${this.
|
|
178
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel},`
|
|
179
|
+
+ ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
|
|
230
180
|
// CurrentRelativeHumidity
|
|
231
181
|
if (!this.device.meter?.hide_humidity) {
|
|
232
|
-
this.CurrentRelativeHumidity =
|
|
233
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Humidity: ${this.CurrentRelativeHumidity}%`);
|
|
182
|
+
this.HumiditySensor.CurrentRelativeHumidity = deviceStatus.body.humidity;
|
|
183
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Humidity: ${this.HumiditySensor.CurrentRelativeHumidity}%`);
|
|
234
184
|
}
|
|
235
185
|
// CurrentTemperature
|
|
236
186
|
if (!this.device.meter?.hide_temperature) {
|
|
237
|
-
this.CurrentTemperature =
|
|
238
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Temperature: ${this.CurrentTemperature}°c`);
|
|
187
|
+
this.TemperatureSensor.CurrentTemperature = deviceStatus.body.temperature;
|
|
188
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Temperature: ${this.TemperatureSensor.CurrentTemperature}°c`);
|
|
189
|
+
}
|
|
190
|
+
// Firmware Version
|
|
191
|
+
const version = deviceStatus.body.version?.toString();
|
|
192
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
|
|
193
|
+
if (deviceStatus.body.version) {
|
|
194
|
+
const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
|
|
195
|
+
this.accessory
|
|
196
|
+
.getService(this.hap.Service.AccessoryInformation)
|
|
197
|
+
.setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
|
|
198
|
+
.setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
|
|
199
|
+
.getCharacteristic(this.hap.Characteristic.FirmwareRevision)
|
|
200
|
+
.updateValue(deviceVersion);
|
|
201
|
+
this.accessory.context.deviceVersion = deviceVersion;
|
|
202
|
+
this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
|
|
239
203
|
}
|
|
240
|
-
// Battery
|
|
241
|
-
this.BatteryLevel = Number(this.OpenAPI_BatteryLevel);
|
|
242
|
-
if (this.BatteryLevel < 10) {
|
|
243
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_LOW;
|
|
244
|
-
}
|
|
245
|
-
else {
|
|
246
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
247
|
-
}
|
|
248
|
-
if (Number.isNaN(this.BatteryLevel)) {
|
|
249
|
-
this.BatteryLevel = 100;
|
|
250
|
-
}
|
|
251
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel},`
|
|
252
|
-
+ ` StatusLowBattery: ${this.StatusLowBattery}`);
|
|
253
|
-
// FirmwareRevision
|
|
254
|
-
this.FirmwareRevision = this.OpenAPI_FirmwareRevision;
|
|
255
|
-
this.accessory.context.FirmwareRevision = this.FirmwareRevision;
|
|
256
204
|
}
|
|
257
205
|
/**
|
|
258
206
|
* Asks the SwitchBot API for the latest device information
|
|
@@ -285,108 +233,43 @@ export class Meter {
|
|
|
285
233
|
this.getCustomBLEAddress(switchbot);
|
|
286
234
|
// Start to monitor advertisement packets
|
|
287
235
|
(async () => {
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
id: this.device.bleMac,
|
|
291
|
-
});
|
|
236
|
+
// Start to monitor advertisement packets
|
|
237
|
+
await switchbot.startScan({ model: this.device.bleModel, id: this.device.bleMac });
|
|
292
238
|
// Set an event handler
|
|
293
239
|
switchbot.onadvertisement = (ad) => {
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
240
|
+
if (this.device.bleMac === ad.address && ad.model === this.device.bleModel) {
|
|
241
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, ' ')}`);
|
|
242
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.model}`);
|
|
297
243
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
|
|
298
|
-
this.BLE_CurrentRelativeHumidity = ad.serviceData.humidity < 0 ? 0 : ad.serviceData.humidity > 100 ? 100 : ad.serviceData.humidity;
|
|
299
|
-
this.BLE_CurrentTemperature = ad.serviceData.temperature;
|
|
300
|
-
this.BLE_Celsius = ad.serviceData.temperature.c;
|
|
301
|
-
this.BLE_Fahrenheit = ad.serviceData.temperature.f;
|
|
302
|
-
this.BLE_BatteryLevel = ad.serviceData.battery;
|
|
303
244
|
}
|
|
304
245
|
else {
|
|
305
246
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
|
|
306
247
|
}
|
|
307
248
|
};
|
|
308
|
-
// Wait
|
|
249
|
+
// Wait 10 seconds
|
|
309
250
|
await switchbot.wait(this.scanDuration * 1000);
|
|
310
251
|
// Stop to monitor
|
|
311
252
|
await switchbot.stopScan();
|
|
312
253
|
// Update HomeKit
|
|
313
|
-
await this.BLEparseStatus();
|
|
254
|
+
await this.BLEparseStatus(switchbot.onadvertisement.serviceData);
|
|
314
255
|
await this.updateHomeKitCharacteristics();
|
|
315
256
|
})();
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
model: 'T',
|
|
320
|
-
id: this.device.bleMac,
|
|
321
|
-
})
|
|
322
|
-
.then(async () => {
|
|
323
|
-
// Set an event handler
|
|
324
|
-
switchbot.onadvertisement = async (ad: ad) => {
|
|
325
|
-
this.debugLog(
|
|
326
|
-
`${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
|
|
327
|
-
` BLE Address Found: ${ad.address}`,
|
|
328
|
-
);
|
|
329
|
-
if (ad.serviceData.humidity! > 0) {
|
|
330
|
-
// reject unreliable data
|
|
331
|
-
this.BLE_CurrentRelativeHumidity = ad.serviceData.humidity;
|
|
332
|
-
}
|
|
333
|
-
this.BLE_CurrentTemperature = ad.serviceData.temperature;
|
|
334
|
-
this.BLE_Celsius = ad.serviceData.temperature!.c;
|
|
335
|
-
this.BLE_Fahrenheit = ad.serviceData.temperature!.f;
|
|
336
|
-
this.BLE_BatteryLevel = ad.serviceData.battery;
|
|
337
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
|
|
338
|
-
this.debugLog(
|
|
339
|
-
`${this.device.deviceType}: ${this.accessory.displayName} model: ${ad.serviceData.model}, modelName: ${ad.serviceData.modelName}, ` +
|
|
340
|
-
`temperature: ${JSON.stringify(ad.serviceData.temperature?.c)}, humidity: ${ad.serviceData.humidity}, ` +
|
|
341
|
-
`battery: ${ad.serviceData.battery}`,
|
|
342
|
-
);
|
|
343
|
-
|
|
344
|
-
if (ad.serviceData) {
|
|
345
|
-
this.BLE_IsConnected = true;
|
|
346
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
|
|
347
|
-
await this.stopScanning(switchbot);
|
|
348
|
-
} else {
|
|
349
|
-
this.BLE_IsConnected = false;
|
|
350
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
|
|
351
|
-
}
|
|
352
|
-
};
|
|
353
|
-
// Wait
|
|
354
|
-
return await sleep(this.scanDuration * 1000);
|
|
355
|
-
})
|
|
356
|
-
.then(async () => {
|
|
357
|
-
// Stop to monitor
|
|
358
|
-
await this.stopScanning(switchbot);
|
|
359
|
-
})
|
|
360
|
-
.catch(async (e: any) => {
|
|
361
|
-
this.apiError(e);
|
|
362
|
-
this.errorLog(
|
|
363
|
-
`${this.device.deviceType}: ${this.accessory.displayName} failed BLERefreshStatus with ${this.device.connectionType}` +
|
|
364
|
-
` Connection, Error Message: ${JSON.stringify(e.message)}`,
|
|
365
|
-
);
|
|
366
|
-
await this.BLERefreshConnection(switchbot);
|
|
367
|
-
});
|
|
368
|
-
} else {
|
|
369
|
-
await this.BLERefreshConnection(switchbot);
|
|
370
|
-
}*/
|
|
257
|
+
if (switchbot === undefined) {
|
|
258
|
+
await this.BLERefreshConnection(switchbot);
|
|
259
|
+
}
|
|
371
260
|
}
|
|
372
261
|
async openAPIRefreshStatus() {
|
|
373
262
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
|
|
374
263
|
try {
|
|
375
|
-
const { body, statusCode } = await
|
|
376
|
-
headers: this.platform.generateHeaders(),
|
|
377
|
-
});
|
|
264
|
+
const { body, statusCode } = await this.platform.retryRequest(this.deviceMaxRetries, this.deviceDelayBetweenRetries, `${Devices}/${this.device.deviceId}/status`, { headers: this.platform.generateHeaders() });
|
|
378
265
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
|
|
379
266
|
const deviceStatus = await body.json();
|
|
380
267
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
|
|
381
268
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
|
|
382
269
|
if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
|
|
383
|
-
this.
|
|
270
|
+
this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
384
271
|
+ `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
|
|
385
|
-
this.
|
|
386
|
-
this.OpenAPI_CurrentTemperature = deviceStatus.body.temperature;
|
|
387
|
-
this.OpenAPI_BatteryLevel = deviceStatus.body.battery;
|
|
388
|
-
this.OpenAPI_FirmwareRevision = deviceStatus.body.version;
|
|
389
|
-
this.openAPIparseStatus();
|
|
272
|
+
this.openAPIparseStatus(deviceStatus);
|
|
390
273
|
this.updateHomeKitCharacteristics();
|
|
391
274
|
}
|
|
392
275
|
else {
|
|
@@ -408,148 +291,77 @@ export class Meter {
|
|
|
408
291
|
const entry = { time: Math.round(new Date().valueOf() / 1000) };
|
|
409
292
|
// CurrentRelativeHumidity
|
|
410
293
|
if (!this.device.meter?.hide_humidity) {
|
|
411
|
-
if (this.CurrentRelativeHumidity === undefined) {
|
|
412
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}
|
|
294
|
+
if (this.HumiditySensor.CurrentRelativeHumidity === undefined) {
|
|
295
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
|
|
296
|
+
+ ` CurrentRelativeHumidity: ${this.HumiditySensor.CurrentRelativeHumidity}`);
|
|
413
297
|
}
|
|
414
298
|
else {
|
|
299
|
+
this.accessory.context.CurrentRelativeHumidity = this.HumiditySensor.CurrentRelativeHumidity;
|
|
300
|
+
this.HumiditySensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity, this.HumiditySensor.CurrentRelativeHumidity);
|
|
301
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
|
|
302
|
+
+ ` updateCharacteristic CurrentRelativeHumidity: ${this.HumiditySensor.CurrentRelativeHumidity}`);
|
|
415
303
|
if (this.device.mqttURL) {
|
|
416
|
-
mqttmessage.push(`"humidity": ${this.CurrentRelativeHumidity}`);
|
|
304
|
+
mqttmessage.push(`"humidity": ${this.HumiditySensor.CurrentRelativeHumidity}`);
|
|
417
305
|
}
|
|
418
306
|
if (this.device.history) {
|
|
419
|
-
entry['humidity'] = this.CurrentRelativeHumidity;
|
|
307
|
+
entry['humidity'] = this.HumiditySensor.CurrentRelativeHumidity;
|
|
420
308
|
}
|
|
421
|
-
this.accessory.context.CurrentRelativeHumidity = this.CurrentRelativeHumidity;
|
|
422
|
-
this.humidityService?.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity, this.CurrentRelativeHumidity);
|
|
423
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
424
|
-
+ `updateCharacteristic CurrentRelativeHumidity: ${this.CurrentRelativeHumidity}`);
|
|
425
309
|
}
|
|
426
310
|
}
|
|
427
311
|
// CurrentTemperature
|
|
428
312
|
if (!this.device.meter?.hide_temperature) {
|
|
429
|
-
if (this.CurrentTemperature === undefined) {
|
|
430
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.CurrentTemperature}`);
|
|
313
|
+
if (this.TemperatureSensor.CurrentTemperature === undefined) {
|
|
314
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}`);
|
|
431
315
|
}
|
|
432
316
|
else {
|
|
317
|
+
this.accessory.context.CurrentTemperature = this.TemperatureSensor.CurrentTemperature;
|
|
318
|
+
this.TemperatureSensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, this.TemperatureSensor.CurrentTemperature);
|
|
319
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
|
|
320
|
+
+ ` CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}`);
|
|
433
321
|
if (this.device.mqttURL) {
|
|
434
|
-
mqttmessage.push(`"temperature": ${this.CurrentTemperature}`);
|
|
322
|
+
mqttmessage.push(`"temperature": ${this.TemperatureSensor.CurrentTemperature}`);
|
|
435
323
|
}
|
|
436
324
|
if (this.device.history) {
|
|
437
|
-
entry['temp'] = this.CurrentTemperature;
|
|
325
|
+
entry['temp'] = this.TemperatureSensor.CurrentTemperature;
|
|
438
326
|
}
|
|
439
|
-
this.accessory.context.CurrentTemperature = this.CurrentTemperature;
|
|
440
|
-
this.temperatureService?.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, this.CurrentTemperature);
|
|
441
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic CurrentTemperature: ${this.CurrentTemperature}`);
|
|
442
327
|
}
|
|
443
328
|
}
|
|
444
329
|
// BatteryLevel
|
|
445
|
-
if (this.BatteryLevel === undefined) {
|
|
446
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.BatteryLevel}`);
|
|
330
|
+
if (this.Battery.BatteryLevel === undefined) {
|
|
331
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BatteryLevel: ${this.Battery.BatteryLevel}`);
|
|
447
332
|
}
|
|
448
333
|
else {
|
|
334
|
+
this.accessory.context.BatteryLevel = this.Battery.BatteryLevel;
|
|
335
|
+
this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, this.Battery.BatteryLevel);
|
|
336
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.Battery.BatteryLevel}`);
|
|
449
337
|
if (this.device.mqttURL) {
|
|
450
|
-
mqttmessage.push(`"battery": ${this.BatteryLevel}`);
|
|
338
|
+
mqttmessage.push(`"battery": ${this.Battery.BatteryLevel}`);
|
|
451
339
|
}
|
|
452
|
-
this.accessory.context.BatteryLevel = this.BatteryLevel;
|
|
453
|
-
this.batteryService?.updateCharacteristic(this.hap.Characteristic.BatteryLevel, this.BatteryLevel);
|
|
454
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic BatteryLevel: ${this.BatteryLevel}`);
|
|
455
340
|
}
|
|
456
|
-
if (this.StatusLowBattery === undefined) {
|
|
457
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.StatusLowBattery}`);
|
|
341
|
+
if (this.Battery.StatusLowBattery === undefined) {
|
|
342
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} StatusLowBattery: ${this.Battery.StatusLowBattery}`);
|
|
458
343
|
}
|
|
459
344
|
else {
|
|
345
|
+
this.accessory.context.StatusLowBattery = this.Battery.StatusLowBattery;
|
|
346
|
+
this.Battery.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, this.Battery.StatusLowBattery);
|
|
347
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic`
|
|
348
|
+
+ ` StatusLowBattery: ${this.Battery.StatusLowBattery}`);
|
|
460
349
|
if (this.device.mqttURL) {
|
|
461
|
-
mqttmessage.push(`"lowBattery": ${this.StatusLowBattery}`);
|
|
350
|
+
mqttmessage.push(`"lowBattery": ${this.Battery.StatusLowBattery}`);
|
|
462
351
|
}
|
|
463
|
-
this.accessory.context.StatusLowBattery = this.StatusLowBattery;
|
|
464
|
-
this.batteryService?.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, this.StatusLowBattery);
|
|
465
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic StatusLowBattery: ${this.StatusLowBattery}`);
|
|
466
352
|
}
|
|
467
|
-
// MQTT
|
|
353
|
+
// MQTT Publish
|
|
468
354
|
if (this.device.mqttURL) {
|
|
469
355
|
this.mqttPublish(`{${mqttmessage.join(',')}}`);
|
|
470
356
|
}
|
|
471
|
-
|
|
357
|
+
// History Service
|
|
358
|
+
if (!this.device.meter?.hide_humidity && (Number(this.HumiditySensor.CurrentRelativeHumidity) > 0)) {
|
|
472
359
|
// reject unreliable data
|
|
473
360
|
if (this.device.history) {
|
|
474
361
|
this.historyService?.addEntry(entry);
|
|
475
362
|
}
|
|
476
363
|
}
|
|
477
364
|
}
|
|
478
|
-
/*
|
|
479
|
-
* Publish MQTT message for topics of
|
|
480
|
-
* 'homebridge-switchbot/meter/xx:xx:xx:xx:xx:xx'
|
|
481
|
-
*/
|
|
482
|
-
mqttPublish(message) {
|
|
483
|
-
const mac = this.device.deviceId
|
|
484
|
-
?.toLowerCase()
|
|
485
|
-
.match(/[\s\S]{1,2}/g)
|
|
486
|
-
?.join(':');
|
|
487
|
-
const options = this.device.mqttPubOptions || {};
|
|
488
|
-
this.mqttClient?.publish(`homebridge-switchbot/meter/${mac}`, `${message}`, options);
|
|
489
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MQTT message: ${message} options:${JSON.stringify(options)}`);
|
|
490
|
-
}
|
|
491
|
-
/*
|
|
492
|
-
* Setup MQTT hadler if URL is specified.
|
|
493
|
-
*/
|
|
494
|
-
async setupMqtt(device) {
|
|
495
|
-
if (device.mqttURL) {
|
|
496
|
-
try {
|
|
497
|
-
const { connectAsync } = asyncmqtt;
|
|
498
|
-
this.mqttClient = await connectAsync(device.mqttURL, device.mqttOptions || {});
|
|
499
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} MQTT connection has been established successfully.`);
|
|
500
|
-
this.mqttClient.on('error', (e) => {
|
|
501
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Failed to publish MQTT messages. ${e}`);
|
|
502
|
-
});
|
|
503
|
-
}
|
|
504
|
-
catch (e) {
|
|
505
|
-
this.mqttClient = null;
|
|
506
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Failed to establish MQTT connection. ${e}`);
|
|
507
|
-
}
|
|
508
|
-
}
|
|
509
|
-
}
|
|
510
|
-
/*
|
|
511
|
-
* Setup EVE history graph feature if enabled.
|
|
512
|
-
*/
|
|
513
|
-
async setupHistoryService(device) {
|
|
514
|
-
const mac = this.device
|
|
515
|
-
.deviceId.match(/.{1,2}/g)
|
|
516
|
-
.join(':')
|
|
517
|
-
.toLowerCase();
|
|
518
|
-
this.historyService = device.history
|
|
519
|
-
? new this.platform.fakegatoAPI('room', this.accessory, {
|
|
520
|
-
log: this.platform.log,
|
|
521
|
-
storage: 'fs',
|
|
522
|
-
filename: `${hostname().split('.')[0]}_${mac}_persist.json`,
|
|
523
|
-
})
|
|
524
|
-
: null;
|
|
525
|
-
}
|
|
526
|
-
async stopScanning(switchbot) {
|
|
527
|
-
switchbot.stopScan();
|
|
528
|
-
if (this.BLE_IsConnected) {
|
|
529
|
-
await this.BLEparseStatus();
|
|
530
|
-
await this.updateHomeKitCharacteristics();
|
|
531
|
-
}
|
|
532
|
-
else {
|
|
533
|
-
await this.BLERefreshConnection(switchbot);
|
|
534
|
-
}
|
|
535
|
-
}
|
|
536
|
-
async getCustomBLEAddress(switchbot) {
|
|
537
|
-
if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
|
|
538
|
-
(async () => {
|
|
539
|
-
// Start to monitor advertisement packets
|
|
540
|
-
await switchbot.startScan({
|
|
541
|
-
model: 'T',
|
|
542
|
-
});
|
|
543
|
-
// Set an event handler
|
|
544
|
-
switchbot.onadvertisement = (ad) => {
|
|
545
|
-
this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, ' ')}`);
|
|
546
|
-
};
|
|
547
|
-
await sleep(10000);
|
|
548
|
-
// Stop to monitor
|
|
549
|
-
switchbot.stopScan();
|
|
550
|
-
})();
|
|
551
|
-
}
|
|
552
|
-
}
|
|
553
365
|
async BLERefreshConnection(switchbot) {
|
|
554
366
|
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} wasn't able to establish BLE Connection, node-switchbot:`
|
|
555
367
|
+ ` ${JSON.stringify(switchbot)}`);
|
|
@@ -558,240 +370,26 @@ export class Meter {
|
|
|
558
370
|
await this.openAPIRefreshStatus();
|
|
559
371
|
}
|
|
560
372
|
}
|
|
561
|
-
async scan(device) {
|
|
562
|
-
if (device.scanDuration) {
|
|
563
|
-
this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
|
|
564
|
-
if (this.BLE) {
|
|
565
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
|
|
566
|
-
}
|
|
567
|
-
}
|
|
568
|
-
else {
|
|
569
|
-
this.scanDuration = this.accessory.context.scanDuration = 1;
|
|
570
|
-
if (this.BLE) {
|
|
571
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
|
|
572
|
-
}
|
|
573
|
-
}
|
|
574
|
-
}
|
|
575
|
-
async statusCode(statusCode) {
|
|
576
|
-
switch (statusCode) {
|
|
577
|
-
case 151:
|
|
578
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command not supported by this deviceType, statusCode: ${statusCode}`);
|
|
579
|
-
break;
|
|
580
|
-
case 152:
|
|
581
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found, statusCode: ${statusCode}`);
|
|
582
|
-
break;
|
|
583
|
-
case 160:
|
|
584
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported, statusCode: ${statusCode}`);
|
|
585
|
-
break;
|
|
586
|
-
case 161:
|
|
587
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline, statusCode: ${statusCode}`);
|
|
588
|
-
this.offlineOff();
|
|
589
|
-
break;
|
|
590
|
-
case 171:
|
|
591
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline, statusCode: ${statusCode}. ` +
|
|
592
|
-
`Hub: ${this.device.hubDeviceId}`);
|
|
593
|
-
this.offlineOff();
|
|
594
|
-
break;
|
|
595
|
-
case 190:
|
|
596
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
|
|
597
|
-
` Or command format is invalid, statusCode: ${statusCode}`);
|
|
598
|
-
break;
|
|
599
|
-
case 100:
|
|
600
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent, statusCode: ${statusCode}`);
|
|
601
|
-
break;
|
|
602
|
-
case 200:
|
|
603
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Request successful, statusCode: ${statusCode}`);
|
|
604
|
-
break;
|
|
605
|
-
case 400:
|
|
606
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Bad Request, The client has issued an invalid request. `
|
|
607
|
-
+ `This is commonly used to specify validation errors in a request payload, statusCode: ${statusCode}`);
|
|
608
|
-
break;
|
|
609
|
-
case 401:
|
|
610
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unauthorized, Authorization for the API is required, `
|
|
611
|
-
+ `but the request has not been authenticated, statusCode: ${statusCode}`);
|
|
612
|
-
break;
|
|
613
|
-
case 403:
|
|
614
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Forbidden, The request has been authenticated but does not `
|
|
615
|
-
+ `have appropriate permissions, or a requested resource is not found, statusCode: ${statusCode}`);
|
|
616
|
-
break;
|
|
617
|
-
case 404:
|
|
618
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Found, Specifies the requested path does not exist, `
|
|
619
|
-
+ `statusCode: ${statusCode}`);
|
|
620
|
-
break;
|
|
621
|
-
case 406:
|
|
622
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Acceptable, The client has requested a MIME type via `
|
|
623
|
-
+ `the Accept header for a value not supported by the server, statusCode: ${statusCode}`);
|
|
624
|
-
break;
|
|
625
|
-
case 415:
|
|
626
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unsupported Media Type, The client has defined a contentType `
|
|
627
|
-
+ `header that is not supported by the server, statusCode: ${statusCode}`);
|
|
628
|
-
break;
|
|
629
|
-
case 422:
|
|
630
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unprocessable Entity, The client has made a valid request, `
|
|
631
|
-
+ `but the server cannot process it. This is often used for APIs for which certain limits have been exceeded, statusCode: ${statusCode}`);
|
|
632
|
-
break;
|
|
633
|
-
case 429:
|
|
634
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Too Many Requests, The client has exceeded the number of `
|
|
635
|
-
+ `requests allowed for a given time window, statusCode: ${statusCode}`);
|
|
636
|
-
break;
|
|
637
|
-
case 500:
|
|
638
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Internal Server Error, An unexpected error on the SmartThings `
|
|
639
|
-
+ `servers has occurred. These errors should be rare, statusCode: ${statusCode}`);
|
|
640
|
-
break;
|
|
641
|
-
default:
|
|
642
|
-
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode: ` +
|
|
643
|
-
`${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`);
|
|
644
|
-
}
|
|
645
|
-
}
|
|
646
373
|
async offlineOff() {
|
|
647
374
|
if (this.device.offline) {
|
|
648
|
-
|
|
649
|
-
|
|
375
|
+
if (!this.device.meter?.hide_humidity) {
|
|
376
|
+
this.HumiditySensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity, 50);
|
|
377
|
+
}
|
|
378
|
+
if (!this.device.meter?.hide_temperature) {
|
|
379
|
+
this.TemperatureSensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, 30);
|
|
380
|
+
}
|
|
381
|
+
this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, 100);
|
|
650
382
|
}
|
|
651
383
|
}
|
|
652
384
|
async apiError(e) {
|
|
653
385
|
if (!this.device.meter?.hide_humidity) {
|
|
654
|
-
this.
|
|
386
|
+
this.HumiditySensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentRelativeHumidity, e);
|
|
655
387
|
}
|
|
656
388
|
if (!this.device.meter?.hide_temperature) {
|
|
657
|
-
this.
|
|
658
|
-
}
|
|
659
|
-
this.batteryService?.updateCharacteristic(this.hap.Characteristic.BatteryLevel, e);
|
|
660
|
-
this.batteryService?.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, e);
|
|
661
|
-
}
|
|
662
|
-
async deviceContext() {
|
|
663
|
-
if (this.CurrentRelativeHumidity === undefined) {
|
|
664
|
-
this.CurrentRelativeHumidity = 0;
|
|
665
|
-
}
|
|
666
|
-
else {
|
|
667
|
-
this.CurrentRelativeHumidity = this.accessory.context.CurrentRelativeHumidity;
|
|
668
|
-
}
|
|
669
|
-
if (this.CurrentTemperature === undefined) {
|
|
670
|
-
this.CurrentTemperature = 0;
|
|
671
|
-
}
|
|
672
|
-
else {
|
|
673
|
-
this.CurrentTemperature = this.accessory.context.CurrentTemperature;
|
|
674
|
-
}
|
|
675
|
-
if (this.BatteryLevel === undefined) {
|
|
676
|
-
this.BatteryLevel = 100;
|
|
677
|
-
}
|
|
678
|
-
else {
|
|
679
|
-
this.BatteryLevel = this.accessory.context.BatteryLevel;
|
|
680
|
-
}
|
|
681
|
-
if (this.StatusLowBattery === undefined) {
|
|
682
|
-
this.StatusLowBattery = this.hap.Characteristic.StatusLowBattery.BATTERY_LEVEL_NORMAL;
|
|
683
|
-
this.accessory.context.StatusLowBattery = this.StatusLowBattery;
|
|
684
|
-
}
|
|
685
|
-
else {
|
|
686
|
-
this.StatusLowBattery = this.accessory.context.StatusLowBattery;
|
|
687
|
-
}
|
|
688
|
-
if (this.FirmwareRevision === undefined) {
|
|
689
|
-
this.FirmwareRevision = this.platform.version;
|
|
690
|
-
this.accessory.context.FirmwareRevision = this.FirmwareRevision;
|
|
691
|
-
}
|
|
692
|
-
}
|
|
693
|
-
async refreshRate(device) {
|
|
694
|
-
if (device.refreshRate) {
|
|
695
|
-
this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
|
|
696
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
|
|
697
|
-
}
|
|
698
|
-
else if (this.platform.config.options.refreshRate) {
|
|
699
|
-
this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options.refreshRate;
|
|
700
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
|
|
701
|
-
}
|
|
702
|
-
}
|
|
703
|
-
async deviceConfig(device) {
|
|
704
|
-
let config = {};
|
|
705
|
-
if (device.meter) {
|
|
706
|
-
config = device.meter;
|
|
707
|
-
}
|
|
708
|
-
if (device.connectionType !== undefined) {
|
|
709
|
-
config['connectionType'] = device.connectionType;
|
|
389
|
+
this.TemperatureSensor.Service.updateCharacteristic(this.hap.Characteristic.CurrentTemperature, e);
|
|
710
390
|
}
|
|
711
|
-
|
|
712
|
-
|
|
713
|
-
}
|
|
714
|
-
if (device.mqttURL !== undefined) {
|
|
715
|
-
config['mqttURL'] = device.mqttURL;
|
|
716
|
-
}
|
|
717
|
-
if (device.logging !== undefined) {
|
|
718
|
-
config['logging'] = device.logging;
|
|
719
|
-
}
|
|
720
|
-
if (device.refreshRate !== undefined) {
|
|
721
|
-
config['refreshRate'] = device.refreshRate;
|
|
722
|
-
}
|
|
723
|
-
if (device.scanDuration !== undefined) {
|
|
724
|
-
config['scanDuration'] = device.scanDuration;
|
|
725
|
-
}
|
|
726
|
-
if (device.webhook !== undefined) {
|
|
727
|
-
config['webhook'] = device.webhook;
|
|
728
|
-
}
|
|
729
|
-
if (Object.entries(config).length !== 0) {
|
|
730
|
-
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
731
|
-
}
|
|
732
|
-
}
|
|
733
|
-
async deviceLogs(device) {
|
|
734
|
-
if (this.platform.debugMode) {
|
|
735
|
-
this.deviceLogging = this.accessory.context.logging = 'debugMode';
|
|
736
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
|
|
737
|
-
}
|
|
738
|
-
else if (device.logging) {
|
|
739
|
-
this.deviceLogging = this.accessory.context.logging = device.logging;
|
|
740
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
|
|
741
|
-
}
|
|
742
|
-
else if (this.platform.config.options?.logging) {
|
|
743
|
-
this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
|
|
744
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
|
|
745
|
-
}
|
|
746
|
-
else {
|
|
747
|
-
this.deviceLogging = this.accessory.context.logging = 'standard';
|
|
748
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
|
|
749
|
-
}
|
|
750
|
-
}
|
|
751
|
-
/**
|
|
752
|
-
* Logging for Device
|
|
753
|
-
*/
|
|
754
|
-
infoLog(...log) {
|
|
755
|
-
if (this.enablingDeviceLogging()) {
|
|
756
|
-
this.platform.log.info(String(...log));
|
|
757
|
-
}
|
|
758
|
-
}
|
|
759
|
-
warnLog(...log) {
|
|
760
|
-
if (this.enablingDeviceLogging()) {
|
|
761
|
-
this.platform.log.warn(String(...log));
|
|
762
|
-
}
|
|
763
|
-
}
|
|
764
|
-
debugWarnLog(...log) {
|
|
765
|
-
if (this.enablingDeviceLogging()) {
|
|
766
|
-
if (this.deviceLogging?.includes('debug')) {
|
|
767
|
-
this.platform.log.warn('[DEBUG]', String(...log));
|
|
768
|
-
}
|
|
769
|
-
}
|
|
770
|
-
}
|
|
771
|
-
errorLog(...log) {
|
|
772
|
-
if (this.enablingDeviceLogging()) {
|
|
773
|
-
this.platform.log.error(String(...log));
|
|
774
|
-
}
|
|
775
|
-
}
|
|
776
|
-
debugErrorLog(...log) {
|
|
777
|
-
if (this.enablingDeviceLogging()) {
|
|
778
|
-
if (this.deviceLogging?.includes('debug')) {
|
|
779
|
-
this.platform.log.error('[DEBUG]', String(...log));
|
|
780
|
-
}
|
|
781
|
-
}
|
|
782
|
-
}
|
|
783
|
-
debugLog(...log) {
|
|
784
|
-
if (this.enablingDeviceLogging()) {
|
|
785
|
-
if (this.deviceLogging === 'debug') {
|
|
786
|
-
this.platform.log.info('[DEBUG]', String(...log));
|
|
787
|
-
}
|
|
788
|
-
else {
|
|
789
|
-
this.platform.log.debug(String(...log));
|
|
790
|
-
}
|
|
791
|
-
}
|
|
792
|
-
}
|
|
793
|
-
enablingDeviceLogging() {
|
|
794
|
-
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
391
|
+
this.Battery.Service.updateCharacteristic(this.hap.Characteristic.BatteryLevel, e);
|
|
392
|
+
this.Battery.Service.updateCharacteristic(this.hap.Characteristic.StatusLowBattery, e);
|
|
795
393
|
}
|
|
796
394
|
}
|
|
797
395
|
//# sourceMappingURL=meter.js.map
|