@switchbot/homebridge-switchbot 3.5.0-beta.9 → 3.5.0
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 +166 -24
- package/dist/device/blindtilt.d.ts +21 -96
- package/dist/device/blindtilt.d.ts.map +1 -1
- package/dist/device/blindtilt.js +439 -817
- package/dist/device/blindtilt.js.map +1 -1
- package/dist/device/bot.d.ts +27 -72
- package/dist/device/bot.d.ts.map +1 -1
- package/dist/device/bot.js +835 -865
- package/dist/device/bot.js.map +1 -1
- package/dist/device/ceilinglight.d.ts +15 -69
- package/dist/device/ceilinglight.d.ts.map +1 -1
- package/dist/device/ceilinglight.js +287 -653
- package/dist/device/ceilinglight.js.map +1 -1
- package/dist/device/colorbulb.d.ts +15 -76
- package/dist/device/colorbulb.d.ts.map +1 -1
- package/dist/device/colorbulb.js +354 -732
- package/dist/device/colorbulb.js.map +1 -1
- package/dist/device/contact.d.ts +14 -66
- package/dist/device/contact.d.ts.map +1 -1
- package/dist/device/contact.js +268 -576
- package/dist/device/contact.js.map +1 -1
- package/dist/device/curtain.d.ts +18 -89
- package/dist/device/curtain.d.ts.map +1 -1
- package/dist/device/curtain.js +431 -851
- package/dist/device/curtain.js.map +1 -1
- package/dist/device/device.d.ts +60 -0
- package/dist/device/device.d.ts.map +1 -0
- package/dist/device/device.js +739 -0
- package/dist/device/device.js.map +1 -0
- package/dist/device/fan.d.ts +63 -0
- package/dist/device/fan.d.ts.map +1 -0
- package/dist/device/fan.js +698 -0
- package/dist/device/fan.js.map +1 -0
- package/dist/device/hub.d.ts +15 -60
- package/dist/device/hub.d.ts.map +1 -1
- package/dist/device/hub.js +257 -631
- 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 +266 -629
- package/dist/device/humidifier.js.map +1 -1
- package/dist/device/iosensor.d.ts +12 -64
- package/dist/device/iosensor.d.ts.map +1 -1
- package/dist/device/iosensor.js +215 -615
- package/dist/device/iosensor.js.map +1 -1
- package/dist/device/lightstrip.d.ts +12 -70
- package/dist/device/lightstrip.d.ts.map +1 -1
- package/dist/device/lightstrip.js +336 -645
- package/dist/device/lightstrip.js.map +1 -1
- package/dist/device/lock.d.ts +17 -63
- package/dist/device/lock.d.ts.map +1 -1
- package/dist/device/lock.js +290 -595
- package/dist/device/lock.js.map +1 -1
- package/dist/device/meter.d.ts +15 -64
- package/dist/device/meter.d.ts.map +1 -1
- package/dist/device/meter.js +211 -608
- package/dist/device/meter.js.map +1 -1
- package/dist/device/meterplus.d.ts +15 -65
- package/dist/device/meterplus.d.ts.map +1 -1
- package/dist/device/meterplus.js +205 -615
- package/dist/device/meterplus.js.map +1 -1
- package/dist/device/motion.d.ts +12 -69
- package/dist/device/motion.d.ts.map +1 -1
- package/dist/device/motion.js +202 -563
- package/dist/device/motion.js.map +1 -1
- package/dist/device/plug.d.ts +10 -57
- package/dist/device/plug.d.ts.map +1 -1
- package/dist/device/plug.js +125 -484
- package/dist/device/plug.js.map +1 -1
- package/dist/device/robotvacuumcleaner.d.ts +13 -63
- package/dist/device/robotvacuumcleaner.d.ts.map +1 -1
- package/dist/device/robotvacuumcleaner.js +233 -549
- package/dist/device/robotvacuumcleaner.js.map +1 -1
- package/dist/device/waterdetector.d.ts +11 -63
- package/dist/device/waterdetector.d.ts.map +1 -1
- package/dist/device/waterdetector.js +170 -493
- 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 +340 -468
- 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 +105 -319
- 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 +44 -285
- package/dist/irdevice/camera.js.map +1 -1
- package/dist/irdevice/fan.d.ts +7 -43
- package/dist/irdevice/fan.d.ts.map +1 -1
- package/dist/irdevice/fan.js +92 -350
- 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 +369 -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 +91 -339
- 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 +22 -8
- package/dist/platform.d.ts.map +1 -1
- package/dist/platform.js +342 -191
- package/dist/platform.js.map +1 -1
- package/dist/settings.d.ts +64 -17
- 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 +20 -16
- package/src/custom.d.ts +2 -1
- package/src/device/blindtilt.ts +472 -888
- package/src/device/bot.ts +893 -968
- package/src/device/ceilinglight.ts +304 -709
- package/src/device/colorbulb.ts +370 -803
- package/src/device/contact.ts +301 -611
- package/src/device/curtain.ts +460 -908
- package/src/device/device.ts +755 -0
- package/src/device/fan.ts +749 -0
- package/src/device/hub.ts +294 -664
- package/src/device/humidifier.ts +299 -696
- package/src/device/iosensor.ts +251 -644
- package/src/device/lightstrip.ts +362 -712
- package/src/device/lock.ts +328 -653
- package/src/device/meter.ts +247 -637
- package/src/device/meterplus.ts +240 -644
- package/src/device/motion.ts +230 -598
- package/src/device/plug.ts +139 -525
- package/src/device/robotvacuumcleaner.ts +258 -593
- package/src/device/waterdetector.ts +191 -522
- 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 +370 -527
- package/src/irdevice/airpurifier.ts +132 -356
- package/src/irdevice/camera.ts +58 -311
- package/src/irdevice/fan.ts +109 -379
- package/src/irdevice/irdevice.ts +382 -0
- package/src/irdevice/light.ts +157 -412
- package/src/irdevice/other.ts +507 -648
- package/src/irdevice/tv.ts +121 -375
- package/src/irdevice/vacuumcleaner.ts +59 -311
- package/src/irdevice/waterheater.ts +61 -320
- package/src/platform.ts +395 -259
- package/src/settings.ts +118 -609
- package/src/utils.ts +642 -1
- package/.github/npm-version-script.cjs +0 -81
- package/src/device/waterdetector.json +0 -11
|
@@ -1,122 +1,88 @@
|
|
|
1
|
+
/* Copyright(C) 2021-2024, donavanbecker (https://github.com/donavanbecker). All rights reserved.
|
|
2
|
+
*
|
|
3
|
+
* ceilinglight.ts: @switchbot/homebridge-switchbot.
|
|
4
|
+
*/
|
|
1
5
|
import { request } from 'undici';
|
|
2
|
-
import {
|
|
6
|
+
import { deviceBase } from './device.js';
|
|
3
7
|
import { interval, Subject } from 'rxjs';
|
|
8
|
+
import { Devices } from '../settings.js';
|
|
9
|
+
import { hs2rgb, rgb2hs, m2hs } from '../utils.js';
|
|
4
10
|
import { debounceTime, skipWhile, take, tap } from 'rxjs/operators';
|
|
5
|
-
import { hs2rgb, rgb2hs, m2hs, Devices } from '../settings.js';
|
|
6
11
|
/**
|
|
7
12
|
* Platform Accessory
|
|
8
13
|
* An instance of this class is created for each accessory your platform registers
|
|
9
14
|
* Each accessory may expose multiple services of different service types.
|
|
10
15
|
*/
|
|
11
|
-
export class CeilingLight {
|
|
16
|
+
export class CeilingLight extends deviceBase {
|
|
12
17
|
platform;
|
|
13
|
-
accessory;
|
|
14
|
-
device;
|
|
15
|
-
api;
|
|
16
|
-
log;
|
|
17
|
-
config;
|
|
18
|
-
hap;
|
|
19
18
|
// Services
|
|
20
|
-
|
|
21
|
-
// Characteristic Values
|
|
22
|
-
On;
|
|
23
|
-
Hue;
|
|
24
|
-
Saturation;
|
|
25
|
-
Brightness;
|
|
26
|
-
ColorTemperature;
|
|
27
|
-
FirmwareRevision;
|
|
28
|
-
// OpenAPI Status
|
|
29
|
-
OpenAPI_On;
|
|
30
|
-
OpenAPI_RGB;
|
|
31
|
-
OpenAPI_Brightness;
|
|
32
|
-
OpenAPI_FirmwareRevision;
|
|
33
|
-
OpenAPI_ColorTemperature;
|
|
34
|
-
// BLE Status
|
|
35
|
-
BLE_Delay;
|
|
36
|
-
BLE_On;
|
|
37
|
-
BLE_WifiRssi;
|
|
38
|
-
// BLE Others
|
|
39
|
-
BLE_IsConnected;
|
|
40
|
-
// Config
|
|
41
|
-
set_minStep;
|
|
42
|
-
scanDuration;
|
|
43
|
-
deviceLogging;
|
|
44
|
-
deviceRefreshRate;
|
|
45
|
-
adaptiveLightingShift;
|
|
19
|
+
LightBulb;
|
|
46
20
|
// Adaptive Lighting
|
|
47
21
|
AdaptiveLightingController;
|
|
48
|
-
|
|
49
|
-
maxKelvin;
|
|
50
|
-
// Others
|
|
51
|
-
cacheKelvin;
|
|
22
|
+
adaptiveLightingShift;
|
|
52
23
|
// Updates
|
|
53
24
|
ceilingLightUpdateInProgress;
|
|
54
25
|
doCeilingLightUpdate;
|
|
55
|
-
// Connection
|
|
56
|
-
OpenAPI;
|
|
57
|
-
BLE;
|
|
58
26
|
constructor(platform, accessory, device) {
|
|
27
|
+
super(platform, accessory, device);
|
|
59
28
|
this.platform = platform;
|
|
60
|
-
this.accessory = accessory;
|
|
61
|
-
this.device = device;
|
|
62
|
-
this.api = this.platform.api;
|
|
63
|
-
this.log = this.platform.log;
|
|
64
|
-
this.config = this.platform.config;
|
|
65
|
-
this.hap = this.api.hap;
|
|
66
|
-
// Connection
|
|
67
|
-
this.BLE = this.device.connectionType === 'BLE' || this.device.connectionType === 'BLE/OpenAPI';
|
|
68
|
-
this.OpenAPI = this.device.connectionType === 'OpenAPI' || this.device.connectionType === 'BLE/OpenAPI';
|
|
69
29
|
// default placeholders
|
|
70
|
-
this.deviceLogs(device);
|
|
71
|
-
this.scan(device);
|
|
72
|
-
this.refreshRate(device);
|
|
73
30
|
this.adaptiveLighting(device);
|
|
74
|
-
this.deviceContext();
|
|
75
|
-
this.deviceConfig(device);
|
|
76
31
|
// this is subject we use to track when we need to POST changes to the SwitchBot API
|
|
77
32
|
this.doCeilingLightUpdate = new Subject();
|
|
78
33
|
this.ceilingLightUpdateInProgress = false;
|
|
79
|
-
//
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
.getService(this.hap.Service.
|
|
84
|
-
.
|
|
85
|
-
.
|
|
86
|
-
.
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
this.accessory.
|
|
95
|
-
|
|
96
|
-
this.accessory.context.adaptiveLighting
|
|
97
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLighting: ${this.accessory.context.adaptiveLighting}`);
|
|
34
|
+
// Initialize LightBulb Service
|
|
35
|
+
accessory.context.LightBulb = accessory.context.LightBulb ?? {};
|
|
36
|
+
this.LightBulb = {
|
|
37
|
+
Name: accessory.context.LightBul.bName ?? accessory.displayName,
|
|
38
|
+
Service: accessory.getService(this.hap.Service.Lightbulb) ?? accessory.addService(this.hap.Service.Lightbulb),
|
|
39
|
+
On: accessory.context.On ?? false,
|
|
40
|
+
Hue: accessory.context.Hue ?? 0,
|
|
41
|
+
Saturation: accessory.context.Saturation ?? 0,
|
|
42
|
+
Brightness: accessory.context.Brightness ?? 0,
|
|
43
|
+
ColorTemperature: accessory.context.ColorTemperature ?? 140,
|
|
44
|
+
};
|
|
45
|
+
accessory.context.LightBulb = this.LightBulb;
|
|
46
|
+
// Adaptive Lighting
|
|
47
|
+
if (this.adaptiveLightingShift === -1 && accessory.context.adaptiveLighting) {
|
|
48
|
+
accessory.removeService(this.LightBulb.Service);
|
|
49
|
+
this.LightBulb.Service = accessory.addService(this.hap.Service.Lightbulb);
|
|
50
|
+
accessory.context.adaptiveLighting = false;
|
|
51
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} adaptiveLighting: ${accessory.context.adaptiveLighting}`);
|
|
98
52
|
}
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
53
|
+
if (this.adaptiveLightingShift !== -1) {
|
|
54
|
+
this.AdaptiveLightingController = new platform.api.hap.AdaptiveLightingController(this.LightBulb.Service, {
|
|
55
|
+
customTemperatureAdjustment: this.adaptiveLightingShift,
|
|
56
|
+
});
|
|
57
|
+
this.accessory.configureController(this.AdaptiveLightingController);
|
|
58
|
+
this.accessory.context.adaptiveLighting = true;
|
|
59
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLighting: ${this.accessory.context.adaptiveLighting},`
|
|
60
|
+
+ ` adaptiveLightingShift: ${this.adaptiveLightingShift}`);
|
|
102
61
|
}
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
62
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
|
|
63
|
+
// Initialize LightBulb Characteristics
|
|
64
|
+
this.LightBulb.Service
|
|
65
|
+
.setCharacteristic(this.hap.Characteristic.Name, this.LightBulb.Name)
|
|
66
|
+
.getCharacteristic(this.hap.Characteristic.On)
|
|
67
|
+
.onGet(() => {
|
|
68
|
+
return this.LightBulb.On;
|
|
69
|
+
})
|
|
70
|
+
.onSet(this.OnSet.bind(this));
|
|
71
|
+
// Initialize LightBulb Brightness
|
|
72
|
+
this.LightBulb.Service
|
|
107
73
|
.getCharacteristic(this.hap.Characteristic.Brightness)
|
|
108
74
|
.setProps({
|
|
109
|
-
minStep:
|
|
75
|
+
minStep: device.ceilinglight?.set_minStep ?? 1,
|
|
110
76
|
minValue: 0,
|
|
111
77
|
maxValue: 100,
|
|
112
78
|
validValueRanges: [0, 100],
|
|
113
79
|
})
|
|
114
80
|
.onGet(() => {
|
|
115
|
-
return this.Brightness;
|
|
81
|
+
return this.LightBulb.Brightness;
|
|
116
82
|
})
|
|
117
83
|
.onSet(this.BrightnessSet.bind(this));
|
|
118
|
-
//
|
|
119
|
-
this.
|
|
84
|
+
// Initialize LightBulb ColorTemperature
|
|
85
|
+
this.LightBulb.Service
|
|
120
86
|
.getCharacteristic(this.hap.Characteristic.ColorTemperature)
|
|
121
87
|
.setProps({
|
|
122
88
|
minValue: 140,
|
|
@@ -124,11 +90,11 @@ export class CeilingLight {
|
|
|
124
90
|
validValueRanges: [140, 500],
|
|
125
91
|
})
|
|
126
92
|
.onGet(() => {
|
|
127
|
-
return this.ColorTemperature;
|
|
93
|
+
return this.LightBulb.ColorTemperature;
|
|
128
94
|
})
|
|
129
95
|
.onSet(this.ColorTemperatureSet.bind(this));
|
|
130
|
-
//
|
|
131
|
-
this.
|
|
96
|
+
// Initialize LightBulb Hue
|
|
97
|
+
this.LightBulb.Service
|
|
132
98
|
.getCharacteristic(this.hap.Characteristic.Hue)
|
|
133
99
|
.setProps({
|
|
134
100
|
minValue: 0,
|
|
@@ -136,11 +102,11 @@ export class CeilingLight {
|
|
|
136
102
|
validValueRanges: [0, 360],
|
|
137
103
|
})
|
|
138
104
|
.onGet(() => {
|
|
139
|
-
return this.Hue;
|
|
105
|
+
return this.LightBulb.Hue;
|
|
140
106
|
})
|
|
141
107
|
.onSet(this.HueSet.bind(this));
|
|
142
|
-
//
|
|
143
|
-
this.
|
|
108
|
+
// Initialize LightBulb Saturation
|
|
109
|
+
this.LightBulb.Service
|
|
144
110
|
.getCharacteristic(this.hap.Characteristic.Saturation)
|
|
145
111
|
.setProps({
|
|
146
112
|
minValue: 0,
|
|
@@ -148,19 +114,11 @@ export class CeilingLight {
|
|
|
148
114
|
validValueRanges: [0, 100],
|
|
149
115
|
})
|
|
150
116
|
.onGet(() => {
|
|
151
|
-
return this.Saturation;
|
|
117
|
+
return this.LightBulb.Saturation;
|
|
152
118
|
})
|
|
153
119
|
.onSet(this.SaturationSet.bind(this));
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
this.AdaptiveLightingController = new platform.api.hap.AdaptiveLightingController(this.lightBulbService, {
|
|
157
|
-
customTemperatureAdjustment: this.adaptiveLightingShift,
|
|
158
|
-
});
|
|
159
|
-
this.accessory.configureController(this.AdaptiveLightingController);
|
|
160
|
-
this.accessory.context.adaptiveLighting = true;
|
|
161
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLighting: ${this.accessory.context.adaptiveLighting},` +
|
|
162
|
-
` adaptiveLightingShift: ${this.adaptiveLightingShift}`);
|
|
163
|
-
}
|
|
120
|
+
// Retrieve initial values and updateHomekit
|
|
121
|
+
this.refreshStatus();
|
|
164
122
|
// Update Homekit
|
|
165
123
|
this.updateHomeKitCharacteristics();
|
|
166
124
|
// Start an update interval
|
|
@@ -170,128 +128,95 @@ export class CeilingLight {
|
|
|
170
128
|
await this.refreshStatus();
|
|
171
129
|
});
|
|
172
130
|
//regisiter webhook event handler
|
|
173
|
-
|
|
174
|
-
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} is listening webhook.`);
|
|
175
|
-
this.platform.webhookEventHandler[this.device.deviceId] = async (context) => {
|
|
176
|
-
try {
|
|
177
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
|
|
178
|
-
const { powerState, brightness, colorTemperature } = context;
|
|
179
|
-
const { On, Brightness, ColorTemperature } = this;
|
|
180
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ` +
|
|
181
|
-
'(powerState, brightness, colorTemperature) = ' +
|
|
182
|
-
`Webhook:(${powerState}, ${brightness}, ${colorTemperature}), ` +
|
|
183
|
-
`current:(${On}, ${Brightness}, ${ColorTemperature})`);
|
|
184
|
-
this.On = powerState === 'ON' ? true : false;
|
|
185
|
-
this.Brightness = brightness;
|
|
186
|
-
this.ColorTemperature = colorTemperature;
|
|
187
|
-
this.updateHomeKitCharacteristics();
|
|
188
|
-
}
|
|
189
|
-
catch (e) {
|
|
190
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
191
|
-
+ `failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e}`);
|
|
192
|
-
}
|
|
193
|
-
};
|
|
194
|
-
}
|
|
131
|
+
this.registerWebhook(accessory, device);
|
|
195
132
|
// Watch for Bulb change events
|
|
196
133
|
// We put in a debounce of 100ms so we don't make duplicate calls
|
|
197
134
|
this.doCeilingLightUpdate
|
|
198
135
|
.pipe(tap(() => {
|
|
199
136
|
this.ceilingLightUpdateInProgress = true;
|
|
200
|
-
}), debounceTime(this.
|
|
137
|
+
}), debounceTime(this.devicePushRate * 1000))
|
|
201
138
|
.subscribe(async () => {
|
|
202
139
|
try {
|
|
203
140
|
await this.pushChanges();
|
|
204
141
|
}
|
|
205
142
|
catch (e) {
|
|
206
143
|
this.apiError(e);
|
|
207
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with ${this.device.connectionType} Connection,`
|
|
208
|
-
` Error Message: ${JSON.stringify(e.message)}`);
|
|
144
|
+
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushChanges with ${this.device.connectionType} Connection,`
|
|
145
|
+
+ ` Error Message: ${JSON.stringify(e.message)}`);
|
|
209
146
|
}
|
|
210
147
|
this.ceilingLightUpdateInProgress = false;
|
|
211
148
|
});
|
|
212
149
|
}
|
|
213
|
-
model(device) {
|
|
214
|
-
let model;
|
|
215
|
-
if (device.deviceType === 'Ceiling Light') {
|
|
216
|
-
model = 'W2612230' || 'W2612240';
|
|
217
|
-
}
|
|
218
|
-
else if (device.deviceType === 'Ceiling Light Pro') {
|
|
219
|
-
model = 'W2612210' || 'W2612220';
|
|
220
|
-
}
|
|
221
|
-
else {
|
|
222
|
-
model = 'unknown';
|
|
223
|
-
}
|
|
224
|
-
return model;
|
|
225
|
-
}
|
|
226
150
|
/**
|
|
227
|
-
* Parse the device status from the
|
|
151
|
+
* Parse the device status from the SwitchBotBLE API
|
|
228
152
|
*/
|
|
229
|
-
async
|
|
230
|
-
if (!this.device.enableCloudService && this.OpenAPI) {
|
|
231
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} parseStatus enableCloudService: ${this.device.enableCloudService}`);
|
|
232
|
-
}
|
|
233
|
-
/*if (this.BLE) {
|
|
234
|
-
await this.BLEparseStatus();
|
|
235
|
-
} else*/ if (this.OpenAPI && this.platform.config.credentials?.token) {
|
|
236
|
-
await this.openAPIparseStatus();
|
|
237
|
-
}
|
|
238
|
-
else {
|
|
239
|
-
await this.offlineOff();
|
|
240
|
-
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:` + ` ${this.device.connectionType}, parseStatus will not happen.`);
|
|
241
|
-
}
|
|
242
|
-
}
|
|
243
|
-
async BLEparseStatus() {
|
|
153
|
+
async BLEparseStatus(serviceData) {
|
|
244
154
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEparseStatus`);
|
|
245
155
|
// State
|
|
246
|
-
switch (
|
|
156
|
+
switch (serviceData.state) {
|
|
247
157
|
case 'on':
|
|
248
|
-
this.On = true;
|
|
158
|
+
this.LightBulb.On = true;
|
|
249
159
|
break;
|
|
250
160
|
default:
|
|
251
|
-
this.On = false;
|
|
161
|
+
this.LightBulb.On = false;
|
|
252
162
|
}
|
|
253
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
|
|
163
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
|
|
254
164
|
}
|
|
255
|
-
|
|
165
|
+
/**
|
|
166
|
+
* Parse the device status from the SwitchBot OpenAPI
|
|
167
|
+
*/
|
|
168
|
+
async openAPIparseStatus(deviceStatus) {
|
|
256
169
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIparseStatus`);
|
|
257
|
-
switch (
|
|
170
|
+
switch (deviceStatus.body.power) {
|
|
258
171
|
case 'on':
|
|
259
|
-
this.On = true;
|
|
172
|
+
this.LightBulb.On = true;
|
|
260
173
|
break;
|
|
261
174
|
default:
|
|
262
|
-
this.On = false;
|
|
175
|
+
this.LightBulb.On = false;
|
|
263
176
|
}
|
|
264
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
|
|
177
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
|
|
265
178
|
// Brightness
|
|
266
|
-
this.Brightness = Number(
|
|
267
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
|
|
179
|
+
this.LightBulb.Brightness = Number(deviceStatus.body.brightness);
|
|
180
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
|
|
268
181
|
// Color, Hue & Brightness
|
|
269
|
-
if (
|
|
270
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} color: ${JSON.stringify(
|
|
271
|
-
const [red, green, blue] =
|
|
182
|
+
if (deviceStatus.body.color) {
|
|
183
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} color: ${JSON.stringify(deviceStatus.body.color)}`);
|
|
184
|
+
const [red, green, blue] = deviceStatus.body.color.split(':');
|
|
272
185
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} red: ${JSON.stringify(red)}`);
|
|
273
186
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} green: ${JSON.stringify(green)}`);
|
|
274
187
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} blue: ${JSON.stringify(blue)}`);
|
|
275
188
|
const [hue, saturation] = rgb2hs(Number(red), Number(green), Number(blue));
|
|
276
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
|
|
189
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
|
|
190
|
+
+ ` hs: ${JSON.stringify(rgb2hs(Number(red), Number(green), Number(blue)))}`);
|
|
277
191
|
// Hue
|
|
278
|
-
this.Hue = hue;
|
|
279
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
|
|
192
|
+
this.LightBulb.Hue = hue;
|
|
193
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.LightBulb.Hue}`);
|
|
280
194
|
// Saturation
|
|
281
|
-
this.Saturation = saturation;
|
|
282
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
|
|
195
|
+
this.LightBulb.Saturation = saturation;
|
|
196
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.LightBulb.Saturation}`);
|
|
283
197
|
}
|
|
284
198
|
// ColorTemperature
|
|
285
|
-
if (!Number.isNaN(
|
|
286
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI ColorTemperature: ${
|
|
287
|
-
const mired = Math.round(1000000 /
|
|
288
|
-
this.ColorTemperature = Number(mired);
|
|
289
|
-
this.ColorTemperature = Math.max(Math.min(this.ColorTemperature, 500), 140);
|
|
290
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
|
|
199
|
+
if (!Number.isNaN(deviceStatus.body.colorTemperature)) {
|
|
200
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} OpenAPI ColorTemperature: ${deviceStatus.body.colorTemperature}`);
|
|
201
|
+
const mired = Math.round(1000000 / deviceStatus.body.colorTemperature);
|
|
202
|
+
this.LightBulb.ColorTemperature = Number(mired);
|
|
203
|
+
this.LightBulb.ColorTemperature = Math.max(Math.min(this.LightBulb.ColorTemperature, 500), 140);
|
|
204
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.LightBulb.ColorTemperature}`);
|
|
205
|
+
}
|
|
206
|
+
// Firmware Version
|
|
207
|
+
const version = deviceStatus.body.version?.toString();
|
|
208
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Firmware Version: ${version?.replace(/^V|-.*$/g, '')}`);
|
|
209
|
+
if (deviceStatus.body.version) {
|
|
210
|
+
const deviceVersion = version?.replace(/^V|-.*$/g, '') ?? '0.0.0';
|
|
211
|
+
this.accessory
|
|
212
|
+
.getService(this.hap.Service.AccessoryInformation)
|
|
213
|
+
.setCharacteristic(this.hap.Characteristic.HardwareRevision, deviceVersion)
|
|
214
|
+
.setCharacteristic(this.hap.Characteristic.FirmwareRevision, deviceVersion)
|
|
215
|
+
.getCharacteristic(this.hap.Characteristic.FirmwareRevision)
|
|
216
|
+
.updateValue(deviceVersion);
|
|
217
|
+
this.accessory.context.deviceVersion = deviceVersion;
|
|
218
|
+
this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceVersion: ${this.accessory.context.deviceVersion}`);
|
|
291
219
|
}
|
|
292
|
-
// FirmwareRevision
|
|
293
|
-
this.FirmwareRevision = this.OpenAPI_FirmwareRevision;
|
|
294
|
-
this.accessory.context.FirmwareRevision = this.FirmwareRevision;
|
|
295
220
|
}
|
|
296
221
|
/**
|
|
297
222
|
* Asks the SwitchBot API for the latest device information
|
|
@@ -307,8 +232,8 @@ export class CeilingLight {
|
|
|
307
232
|
}
|
|
308
233
|
else {
|
|
309
234
|
await this.offlineOff();
|
|
310
|
-
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
|
|
311
|
-
` ${this.device.connectionType}, refreshStatus will not happen.`);
|
|
235
|
+
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
|
|
236
|
+
+ ` ${this.device.connectionType}, refreshStatus will not happen.`);
|
|
312
237
|
}
|
|
313
238
|
}
|
|
314
239
|
async BLERefreshStatus() {
|
|
@@ -324,110 +249,42 @@ export class CeilingLight {
|
|
|
324
249
|
// Start to monitor advertisement packets
|
|
325
250
|
(async () => {
|
|
326
251
|
// Start to monitor advertisement packets
|
|
327
|
-
await switchbot.startScan({
|
|
328
|
-
id: this.device.bleMac,
|
|
329
|
-
});
|
|
252
|
+
await switchbot.startScan({ model: this.device.bleModel, id: this.device.bleMac });
|
|
330
253
|
// Set an event handler
|
|
331
254
|
switchbot.onadvertisement = (ad) => {
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
255
|
+
if (this.device.bleMac === ad.address && ad.model === this.device.bleModel) {
|
|
256
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ${JSON.stringify(ad, null, ' ')}`);
|
|
257
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} address: ${ad.address}, model: ${ad.model}`);
|
|
335
258
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
|
|
336
|
-
this.BLE_On = ad.serviceData.state;
|
|
337
|
-
//this.delay = ad.serviceData.delay;
|
|
338
|
-
//this.timer = ad.serviceData.timer;
|
|
339
|
-
//this.syncUtcTime = ad.serviceData.syncUtcTime;
|
|
340
|
-
//this.wifiRssi = ad.serviceData.wifiRssi;
|
|
341
|
-
//this.overload = ad.serviceData.overload;
|
|
342
|
-
//this.currentPower = ad.serviceData.currentPower;
|
|
343
259
|
}
|
|
344
260
|
else {
|
|
345
261
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
|
|
346
262
|
}
|
|
347
263
|
};
|
|
348
|
-
// Wait
|
|
264
|
+
// Wait 10 seconds
|
|
349
265
|
await switchbot.wait(this.scanDuration * 1000);
|
|
350
266
|
// Stop to monitor
|
|
351
267
|
await switchbot.stopScan();
|
|
352
268
|
// Update HomeKit
|
|
353
|
-
await this.BLEparseStatus();
|
|
269
|
+
await this.BLEparseStatus(switchbot.onadvertisement.serviceData);
|
|
354
270
|
await this.updateHomeKitCharacteristics();
|
|
355
271
|
})();
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
model: '',
|
|
360
|
-
id: this.device.bleMac,
|
|
361
|
-
})
|
|
362
|
-
.then(async () => {
|
|
363
|
-
// Set an event handler
|
|
364
|
-
switchbot.onadvertisement = async (ad: ad) => {
|
|
365
|
-
this.debugLog(
|
|
366
|
-
`${this.device.deviceType}: ${this.accessory.displayName} Config BLE Address: ${this.device.bleMac},` +
|
|
367
|
-
` BLE Address Found: ${ad.address}`,
|
|
368
|
-
);
|
|
369
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
|
|
370
|
-
this.BLE_On = ad.serviceData.state;
|
|
371
|
-
//this.delay = ad.serviceData.delay;
|
|
372
|
-
//this.timer = ad.serviceData.timer;
|
|
373
|
-
//this.syncUtcTime = ad.serviceData.syncUtcTime;
|
|
374
|
-
//this.wifiRssi = ad.serviceData.wifiRssi;
|
|
375
|
-
//this.overload = ad.serviceData.overload;
|
|
376
|
-
//this.currentPower = ad.serviceData.currentPower;
|
|
377
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} serviceData: ${JSON.stringify(ad.serviceData)}`);
|
|
378
|
-
this.debugLog(
|
|
379
|
-
`${this.device.deviceType}: ${this.accessory.displayName} state: ${ad.serviceData.state}, ` +
|
|
380
|
-
`delay: ${ad.serviceData.delay}, timer: ${ad.serviceData.timer}, syncUtcTime: ${ad.serviceData.syncUtcTime} ` +
|
|
381
|
-
`wifiRssi: ${ad.serviceData.wifiRssi}, overload: ${ad.serviceData.overload}, currentPower: ${ad.serviceData.currentPower}`,
|
|
382
|
-
);
|
|
383
|
-
|
|
384
|
-
if (ad.serviceData) {
|
|
385
|
-
this.BLE_IsConnected = true;
|
|
386
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
|
|
387
|
-
await this.stopScanning(switchbot);
|
|
388
|
-
} else {
|
|
389
|
-
this.BLE_IsConnected = false;
|
|
390
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} connected: ${this.BLE_IsConnected}`);
|
|
391
|
-
}
|
|
392
|
-
};
|
|
393
|
-
// Wait
|
|
394
|
-
return await sleep(this.scanDuration * 1000);
|
|
395
|
-
})
|
|
396
|
-
.then(async () => {
|
|
397
|
-
// Stop to monitor
|
|
398
|
-
await this.stopScanning(switchbot);
|
|
399
|
-
})
|
|
400
|
-
.catch(async (e: any) => {
|
|
401
|
-
this.apiError(e);
|
|
402
|
-
this.errorLog(
|
|
403
|
-
`${this.device.deviceType}: ${this.accessory.displayName} failed BLERefreshStatus with ${this.device.connectionType}` +
|
|
404
|
-
` Connection, Error Message: ${JSON.stringify(e.message)}`,
|
|
405
|
-
);
|
|
406
|
-
await this.BLERefreshConnection(switchbot);
|
|
407
|
-
});
|
|
408
|
-
} else {
|
|
409
|
-
await this.BLERefreshConnection(switchbot);
|
|
410
|
-
}*/
|
|
272
|
+
if (switchbot === undefined) {
|
|
273
|
+
await this.BLERefreshConnection(switchbot);
|
|
274
|
+
}
|
|
411
275
|
}
|
|
412
276
|
async openAPIRefreshStatus() {
|
|
413
277
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIRefreshStatus`);
|
|
414
278
|
try {
|
|
415
|
-
const { body, statusCode } = await
|
|
416
|
-
headers: this.platform.generateHeaders(),
|
|
417
|
-
});
|
|
279
|
+
const { body, statusCode } = await this.platform.retryRequest(this.deviceMaxRetries, this.deviceDelayBetweenRetries, `${Devices}/${this.device.deviceId}/status`, { headers: this.platform.generateHeaders() });
|
|
418
280
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} statusCode: ${statusCode}`);
|
|
419
281
|
const deviceStatus = await body.json();
|
|
420
282
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus: ${JSON.stringify(deviceStatus)}`);
|
|
421
283
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
|
|
422
284
|
if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
|
|
423
|
-
this.
|
|
285
|
+
this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
424
286
|
+ `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
|
|
425
|
-
this.
|
|
426
|
-
this.OpenAPI_RGB = deviceStatus.body.color;
|
|
427
|
-
this.OpenAPI_Brightness = deviceStatus.body.brightness;
|
|
428
|
-
this.OpenAPI_ColorTemperature = deviceStatus.body.colorTemperature;
|
|
429
|
-
this.OpenAPI_FirmwareRevision = deviceStatus.body.version;
|
|
430
|
-
this.openAPIparseStatus();
|
|
287
|
+
this.openAPIparseStatus(deviceStatus);
|
|
431
288
|
this.updateHomeKitCharacteristics();
|
|
432
289
|
}
|
|
433
290
|
else {
|
|
@@ -437,8 +294,56 @@ export class CeilingLight {
|
|
|
437
294
|
}
|
|
438
295
|
catch (e) {
|
|
439
296
|
this.apiError(e);
|
|
440
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIRefreshStatus with ${this.device.connectionType}`
|
|
441
|
-
` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
297
|
+
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIRefreshStatus with ${this.device.connectionType}`
|
|
298
|
+
+ ` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
299
|
+
}
|
|
300
|
+
}
|
|
301
|
+
async registerWebhook(accessory, device) {
|
|
302
|
+
if (device.webhook) {
|
|
303
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} is listening webhook.`);
|
|
304
|
+
this.platform.webhookEventHandler[device.deviceId] = async (context) => {
|
|
305
|
+
try {
|
|
306
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} received Webhook: ${JSON.stringify(context)}`);
|
|
307
|
+
const { powerState, brightness, colorTemperature } = context;
|
|
308
|
+
const { On, Brightness, ColorTemperature } = this.LightBulb;
|
|
309
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} ` +
|
|
310
|
+
'(powerState, brightness, colorTemperature) = ' +
|
|
311
|
+
`Webhook:(${powerState}, ${brightness}, ${colorTemperature}), `
|
|
312
|
+
+ `current:(${On}, ${Brightness}, ${ColorTemperature})`);
|
|
313
|
+
// On
|
|
314
|
+
this.LightBulb.On = powerState === 'ON' ? true : false;
|
|
315
|
+
if (accessory.context.Brightness !== this.LightBulb.On) {
|
|
316
|
+
this.infoLog(`${device.deviceType}: ${accessory.displayName} On: ${this.LightBulb.On}`);
|
|
317
|
+
}
|
|
318
|
+
else {
|
|
319
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} On: ${this.LightBulb.On}`);
|
|
320
|
+
}
|
|
321
|
+
// Brightness
|
|
322
|
+
this.LightBulb.Brightness = brightness;
|
|
323
|
+
if (accessory.context.Brightness !== this.LightBulb.Brightness) {
|
|
324
|
+
this.infoLog(`${device.deviceType}: ${accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
|
|
325
|
+
}
|
|
326
|
+
else {
|
|
327
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
|
|
328
|
+
}
|
|
329
|
+
// ColorTemperature
|
|
330
|
+
this.LightBulb.ColorTemperature = colorTemperature;
|
|
331
|
+
if (accessory.context.ColorTemperature !== this.LightBulb.ColorTemperature) {
|
|
332
|
+
this.infoLog(`${device.deviceType}: ${accessory.displayName} ColorTemperature: ${this.LightBulb.ColorTemperature}`);
|
|
333
|
+
}
|
|
334
|
+
else {
|
|
335
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} ColorTemperature: ${this.LightBulb.ColorTemperature}`);
|
|
336
|
+
}
|
|
337
|
+
this.updateHomeKitCharacteristics();
|
|
338
|
+
}
|
|
339
|
+
catch (e) {
|
|
340
|
+
this.errorLog(`${device.deviceType}: ${accessory.displayName} `
|
|
341
|
+
+ `failed to handle webhook. Received: ${JSON.stringify(context)} Error: ${e}`);
|
|
342
|
+
}
|
|
343
|
+
};
|
|
344
|
+
}
|
|
345
|
+
else {
|
|
346
|
+
this.debugLog(`${device.deviceType}: ${accessory.displayName} is not listening webhook.`);
|
|
442
347
|
}
|
|
443
348
|
}
|
|
444
349
|
/**
|
|
@@ -463,7 +368,8 @@ export class CeilingLight {
|
|
|
463
368
|
}
|
|
464
369
|
else {
|
|
465
370
|
await this.offlineOff();
|
|
466
|
-
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
|
|
371
|
+
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Connection Type:`
|
|
372
|
+
+ ` ${this.device.connectionType}, pushChanges will not happen.`);
|
|
467
373
|
}
|
|
468
374
|
// Refresh the status from the API
|
|
469
375
|
interval(15000)
|
|
@@ -475,8 +381,9 @@ export class CeilingLight {
|
|
|
475
381
|
}
|
|
476
382
|
async BLEpushChanges() {
|
|
477
383
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} BLEpushChanges`);
|
|
478
|
-
if (this.On !== this.accessory.context.On) {
|
|
479
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}
|
|
384
|
+
if (this.LightBulb.On !== this.accessory.context.On) {
|
|
385
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
|
|
386
|
+
+ ` BLEpushChanges On: ${this.LightBulb.On} OnCached: ${this.accessory.context.On}`);
|
|
480
387
|
const switchbot = await this.platform.connectBLE();
|
|
481
388
|
// Convert to BLE Address
|
|
482
389
|
this.device.bleMac = this.device
|
|
@@ -490,11 +397,11 @@ export class CeilingLight {
|
|
|
490
397
|
id: this.device.bleMac,
|
|
491
398
|
})
|
|
492
399
|
.then(async (device_list) => {
|
|
493
|
-
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
|
|
494
|
-
return await this.
|
|
495
|
-
max: this.
|
|
400
|
+
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
|
|
401
|
+
return await this.retryBLE({
|
|
402
|
+
max: await this.maxRetryBLE(),
|
|
496
403
|
fn: async () => {
|
|
497
|
-
if (this.On) {
|
|
404
|
+
if (this.LightBulb.On) {
|
|
498
405
|
return await device_list[0].turnOn({ id: this.device.bleMac });
|
|
499
406
|
}
|
|
500
407
|
else {
|
|
@@ -505,24 +412,28 @@ export class CeilingLight {
|
|
|
505
412
|
})
|
|
506
413
|
.then(() => {
|
|
507
414
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Done.`);
|
|
508
|
-
this.
|
|
415
|
+
this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
416
|
+
+ `On: ${this.LightBulb.On} sent over BLE, sent successfully`);
|
|
417
|
+
this.LightBulb.On = false;
|
|
509
418
|
})
|
|
510
419
|
.catch(async (e) => {
|
|
511
420
|
this.apiError(e);
|
|
512
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushChanges with ${this.device.connectionType}`
|
|
513
|
-
` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
421
|
+
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed BLEpushChanges with ${this.device.connectionType}`
|
|
422
|
+
+ ` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
514
423
|
await this.BLEPushConnection();
|
|
515
424
|
});
|
|
516
425
|
}
|
|
517
426
|
else {
|
|
518
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}
|
|
427
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
|
|
428
|
+
+ ` No BLEpushChanges: On: ${this.LightBulb.On}, `
|
|
429
|
+
+ `OnCached: ${this.accessory.context.On}`);
|
|
519
430
|
}
|
|
520
431
|
}
|
|
521
432
|
async openAPIpushChanges() {
|
|
522
433
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} openAPIpushChanges`);
|
|
523
|
-
if (this.On !== this.accessory.context.On) {
|
|
434
|
+
if (this.LightBulb.On !== this.accessory.context.On) {
|
|
524
435
|
let command = '';
|
|
525
|
-
if (this.On) {
|
|
436
|
+
if (this.LightBulb.On) {
|
|
526
437
|
command = 'turnOn';
|
|
527
438
|
}
|
|
528
439
|
else {
|
|
@@ -546,8 +457,10 @@ export class CeilingLight {
|
|
|
546
457
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
|
|
547
458
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
|
|
548
459
|
if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
|
|
549
|
-
this.
|
|
460
|
+
this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
550
461
|
+ `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
|
|
462
|
+
this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
463
|
+
+ `request to SwitchBot API, body: ${JSON.stringify(JSON.parse(bodyChange))} sent successfully`);
|
|
551
464
|
}
|
|
552
465
|
else {
|
|
553
466
|
this.statusCode(statusCode);
|
|
@@ -556,34 +469,34 @@ export class CeilingLight {
|
|
|
556
469
|
}
|
|
557
470
|
catch (e) {
|
|
558
471
|
this.apiError(e);
|
|
559
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIpushChanges with ${this.device.connectionType}`
|
|
560
|
-
` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
472
|
+
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed openAPIpushChanges with ${this.device.connectionType}`
|
|
473
|
+
+ ` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
561
474
|
}
|
|
562
475
|
}
|
|
563
476
|
else {
|
|
564
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges.`
|
|
565
|
-
`On: ${this.On}, `
|
|
566
|
-
`OnCached: ${this.accessory.context.On}`);
|
|
477
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No openAPIpushChanges.`
|
|
478
|
+
+ `On: ${this.LightBulb.On}, `
|
|
479
|
+
+ `OnCached: ${this.accessory.context.On}`);
|
|
567
480
|
}
|
|
568
481
|
// Push Hue & Saturation Update
|
|
569
|
-
if (this.On) {
|
|
482
|
+
if (this.LightBulb.On) {
|
|
570
483
|
await this.pushHueSaturationChanges();
|
|
571
484
|
}
|
|
572
485
|
// Push ColorTemperature Update
|
|
573
|
-
if (this.On) {
|
|
486
|
+
if (this.LightBulb.On) {
|
|
574
487
|
await this.pushColorTemperatureChanges();
|
|
575
488
|
}
|
|
576
489
|
// Push Brightness Update
|
|
577
|
-
if (this.On) {
|
|
490
|
+
if (this.LightBulb.On) {
|
|
578
491
|
await this.pushBrightnessChanges();
|
|
579
492
|
}
|
|
580
493
|
}
|
|
581
494
|
async pushHueSaturationChanges() {
|
|
582
495
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushHueSaturationChanges`);
|
|
583
|
-
if (this.Hue !== this.accessory.context.Hue || this.Saturation !== this.accessory.context.Saturation) {
|
|
584
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${JSON.stringify(this.Hue)}`);
|
|
585
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${JSON.stringify(this.Saturation)}`);
|
|
586
|
-
const [red, green, blue] = hs2rgb(Number(this.Hue), Number(this.Saturation));
|
|
496
|
+
if (this.LightBulb.Hue !== this.accessory.context.Hue || this.LightBulb.Saturation !== this.accessory.context.Saturation) {
|
|
497
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${JSON.stringify(this.LightBulb.Hue)}`);
|
|
498
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${JSON.stringify(this.LightBulb.Saturation)}`);
|
|
499
|
+
const [red, green, blue] = hs2rgb(Number(this.LightBulb.Hue), Number(this.LightBulb.Saturation));
|
|
587
500
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} rgb: ${JSON.stringify([red, green, blue])}`);
|
|
588
501
|
const bodyChange = JSON.stringify({
|
|
589
502
|
command: 'setColor',
|
|
@@ -603,8 +516,10 @@ export class CeilingLight {
|
|
|
603
516
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
|
|
604
517
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
|
|
605
518
|
if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
|
|
606
|
-
this.
|
|
519
|
+
this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
607
520
|
+ `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
|
|
521
|
+
this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
522
|
+
+ `request to SwitchBot API, body: ${JSON.stringify(JSON.parse(bodyChange))} sent successfully`);
|
|
608
523
|
}
|
|
609
524
|
else {
|
|
610
525
|
this.statusCode(statusCode);
|
|
@@ -613,20 +528,20 @@ export class CeilingLight {
|
|
|
613
528
|
}
|
|
614
529
|
catch (e) {
|
|
615
530
|
this.apiError(e);
|
|
616
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushHueSaturationChanges with ${this.device.connectionType}`
|
|
617
|
-
` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
531
|
+
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushHueSaturationChanges with ${this.device.connectionType}`
|
|
532
|
+
+ ` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
618
533
|
}
|
|
619
534
|
}
|
|
620
535
|
else {
|
|
621
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushHueSaturationChanges. Hue: ${this.Hue}, `
|
|
622
|
-
|
|
536
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushHueSaturationChanges. Hue: ${this.LightBulb.Hue}, HueCached: `
|
|
537
|
+
+ `${this.accessory.context.Hue}, Saturation: ${this.LightBulb.Saturation}, SaturationCached: ${this.accessory.context.Saturation}`);
|
|
623
538
|
}
|
|
624
539
|
}
|
|
625
540
|
async pushColorTemperatureChanges() {
|
|
626
541
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushColorTemperatureChanges`);
|
|
627
|
-
if (this.ColorTemperature !== this.accessory.context.ColorTemperature) {
|
|
628
|
-
const kelvin = Math.round(1000000 / Number(this.ColorTemperature));
|
|
629
|
-
this.
|
|
542
|
+
if (this.LightBulb.ColorTemperature !== this.accessory.context.ColorTemperature) {
|
|
543
|
+
const kelvin = Math.round(1000000 / Number(this.LightBulb.ColorTemperature));
|
|
544
|
+
this.accessory.context.kelvin = kelvin;
|
|
630
545
|
const bodyChange = JSON.stringify({
|
|
631
546
|
command: 'setColorTemperature',
|
|
632
547
|
parameter: `${kelvin}`,
|
|
@@ -645,7 +560,7 @@ export class CeilingLight {
|
|
|
645
560
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
|
|
646
561
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
|
|
647
562
|
if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
|
|
648
|
-
this.
|
|
563
|
+
this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
649
564
|
+ `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
|
|
650
565
|
}
|
|
651
566
|
else {
|
|
@@ -655,21 +570,21 @@ export class CeilingLight {
|
|
|
655
570
|
}
|
|
656
571
|
catch (e) {
|
|
657
572
|
this.apiError(e);
|
|
658
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushColorTemperatureChanges with
|
|
659
|
-
` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
573
|
+
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushColorTemperatureChanges with`
|
|
574
|
+
+ ` ${this.device.connectionType} Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
660
575
|
}
|
|
661
576
|
}
|
|
662
577
|
else {
|
|
663
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushColorTemperatureChanges.`
|
|
664
|
-
`ColorTemperature: ${this.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`);
|
|
578
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushColorTemperatureChanges.`
|
|
579
|
+
+ `ColorTemperature: ${this.LightBulb.ColorTemperature}, ColorTemperatureCached: ${this.accessory.context.ColorTemperature}`);
|
|
665
580
|
}
|
|
666
581
|
}
|
|
667
582
|
async pushBrightnessChanges() {
|
|
668
583
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} pushBrightnessChanges`);
|
|
669
|
-
if (this.Brightness !== this.accessory.context.Brightness) {
|
|
584
|
+
if (this.LightBulb.Brightness !== this.accessory.context.Brightness) {
|
|
670
585
|
const bodyChange = JSON.stringify({
|
|
671
586
|
command: 'setBrightness',
|
|
672
|
-
parameter: `${this.Brightness}`,
|
|
587
|
+
parameter: `${this.LightBulb.Brightness}`,
|
|
673
588
|
commandType: 'command',
|
|
674
589
|
});
|
|
675
590
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Sending request to SwitchBot API, body: ${bodyChange},`);
|
|
@@ -685,8 +600,10 @@ export class CeilingLight {
|
|
|
685
600
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus body: ${JSON.stringify(deviceStatus.body)}`);
|
|
686
601
|
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} deviceStatus statusCode: ${deviceStatus.statusCode}`);
|
|
687
602
|
if ((statusCode === 200 || statusCode === 100) && (deviceStatus.statusCode === 200 || deviceStatus.statusCode === 100)) {
|
|
688
|
-
this.
|
|
603
|
+
this.debugSuccessLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
689
604
|
+ `statusCode: ${statusCode} & deviceStatus StatusCode: ${deviceStatus.statusCode}`);
|
|
605
|
+
this.successLog(`${this.device.deviceType}: ${this.accessory.displayName} `
|
|
606
|
+
+ `request to SwitchBot API, body: ${JSON.stringify(JSON.parse(bodyChange))} sent successfully`);
|
|
690
607
|
}
|
|
691
608
|
else {
|
|
692
609
|
this.statusCode(statusCode);
|
|
@@ -695,146 +612,149 @@ export class CeilingLight {
|
|
|
695
612
|
}
|
|
696
613
|
catch (e) {
|
|
697
614
|
this.apiError(e);
|
|
698
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushBrightnessChanges with ${this.device.connectionType}`
|
|
699
|
-
` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
615
|
+
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} failed pushBrightnessChanges with ${this.device.connectionType}`
|
|
616
|
+
+ ` Connection, Error Message: ${JSON.stringify(e.message)}`);
|
|
700
617
|
}
|
|
701
618
|
}
|
|
702
619
|
else {
|
|
703
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushBrightnessChanges.`
|
|
704
|
-
`Brightness: ${this.Brightness}, `
|
|
705
|
-
`BrightnessCached: ${this.accessory.context.Brightness}`);
|
|
620
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No pushBrightnessChanges.`
|
|
621
|
+
+ `Brightness: ${this.LightBulb.Brightness}, `
|
|
622
|
+
+ `BrightnessCached: ${this.accessory.context.Brightness}`);
|
|
706
623
|
}
|
|
707
624
|
}
|
|
708
625
|
/**
|
|
709
626
|
* Handle requests to set the value of the "On" characteristic
|
|
710
627
|
*/
|
|
711
628
|
async OnSet(value) {
|
|
712
|
-
if (this.On === this.accessory.context.On) {
|
|
629
|
+
if (this.LightBulb.On === this.accessory.context.On) {
|
|
713
630
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set On: ${value}`);
|
|
714
631
|
}
|
|
715
632
|
else {
|
|
716
633
|
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set On: ${value}`);
|
|
717
634
|
}
|
|
718
|
-
this.On = value;
|
|
635
|
+
this.LightBulb.On = value;
|
|
719
636
|
this.doCeilingLightUpdate.next();
|
|
720
637
|
}
|
|
721
638
|
/**
|
|
722
639
|
* Handle requests to set the value of the "Brightness" characteristic
|
|
723
640
|
*/
|
|
724
641
|
async BrightnessSet(value) {
|
|
725
|
-
if (this.Brightness === this.accessory.context.Brightness) {
|
|
642
|
+
if (this.LightBulb.Brightness === this.accessory.context.Brightness) {
|
|
726
643
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set Brightness: ${value}`);
|
|
727
644
|
}
|
|
728
|
-
else if (this.On) {
|
|
645
|
+
else if (this.LightBulb.On) {
|
|
729
646
|
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Brightness: ${value}`);
|
|
730
647
|
}
|
|
731
648
|
else {
|
|
732
649
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Brightness: ${value}`);
|
|
733
650
|
}
|
|
734
|
-
this.Brightness = value;
|
|
651
|
+
this.LightBulb.Brightness = value;
|
|
735
652
|
this.doCeilingLightUpdate.next();
|
|
736
653
|
}
|
|
737
654
|
/**
|
|
738
655
|
* Handle requests to set the value of the "ColorTemperature" characteristic
|
|
739
656
|
*/
|
|
740
657
|
async ColorTemperatureSet(value) {
|
|
741
|
-
if (this.ColorTemperature === this.accessory.context.ColorTemperature) {
|
|
658
|
+
if (this.LightBulb.ColorTemperature === this.accessory.context.ColorTemperature) {
|
|
742
659
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set ColorTemperature: ${value}`);
|
|
743
660
|
}
|
|
744
|
-
else if (this.On) {
|
|
661
|
+
else if (this.LightBulb.On) {
|
|
745
662
|
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set ColorTemperature: ${value}`);
|
|
746
663
|
}
|
|
747
664
|
else {
|
|
748
665
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set ColorTemperature: ${value}`);
|
|
749
666
|
}
|
|
667
|
+
const minKelvin = 2000;
|
|
668
|
+
const maxKelvin = 9000;
|
|
750
669
|
// Convert mired to kelvin to nearest 100 (SwitchBot seems to need this)
|
|
751
670
|
const kelvin = Math.round(1000000 / Number(value) / 100) * 100;
|
|
752
671
|
// Check and increase/decrease kelvin to range of device
|
|
753
|
-
const k = Math.min(Math.max(kelvin,
|
|
754
|
-
if (!this.accessory.context.On || this.
|
|
672
|
+
const k = Math.min(Math.max(kelvin, minKelvin), maxKelvin);
|
|
673
|
+
if (!this.accessory.context.On || this.accessory.context.kelvin === k) {
|
|
755
674
|
return;
|
|
756
675
|
}
|
|
757
676
|
// Updating the hue/sat to the corresponding values mimics native adaptive lighting
|
|
758
677
|
const hs = m2hs(value);
|
|
759
|
-
this.
|
|
760
|
-
this.
|
|
761
|
-
this.ColorTemperature = value;
|
|
678
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Hue, hs[0]);
|
|
679
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Saturation, hs[1]);
|
|
680
|
+
this.LightBulb.ColorTemperature = value;
|
|
762
681
|
this.doCeilingLightUpdate.next();
|
|
763
682
|
}
|
|
764
683
|
/**
|
|
765
684
|
* Handle requests to set the value of the "Hue" characteristic
|
|
766
685
|
*/
|
|
767
686
|
async HueSet(value) {
|
|
768
|
-
if (this.Hue === this.accessory.context.Hue) {
|
|
687
|
+
if (this.LightBulb.Hue === this.accessory.context.Hue) {
|
|
769
688
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set Hue: ${value}`);
|
|
770
689
|
}
|
|
771
|
-
else if (this.On) {
|
|
690
|
+
else if (this.LightBulb.On) {
|
|
772
691
|
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Hue: ${value}`);
|
|
773
692
|
}
|
|
774
693
|
else {
|
|
775
694
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Hue: ${value}`);
|
|
776
695
|
}
|
|
777
|
-
this.
|
|
778
|
-
this.Hue = value;
|
|
696
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.ColorTemperature, 140);
|
|
697
|
+
this.LightBulb.Hue = value;
|
|
779
698
|
this.doCeilingLightUpdate.next();
|
|
780
699
|
}
|
|
781
700
|
/**
|
|
782
701
|
* Handle requests to set the value of the "Saturation" characteristic
|
|
783
702
|
*/
|
|
784
703
|
async SaturationSet(value) {
|
|
785
|
-
if (this.Saturation === this.accessory.context.Saturation) {
|
|
704
|
+
if (this.LightBulb.Saturation === this.accessory.context.Saturation) {
|
|
786
705
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} No Changes, Set Saturation: ${value}`);
|
|
787
706
|
}
|
|
788
|
-
else if (this.On) {
|
|
707
|
+
else if (this.LightBulb.On) {
|
|
789
708
|
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Saturation: ${value}`);
|
|
790
709
|
}
|
|
791
710
|
else {
|
|
792
711
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Set Saturation: ${value}`);
|
|
793
712
|
}
|
|
794
|
-
this.
|
|
795
|
-
this.Saturation = value;
|
|
713
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.ColorTemperature, 140);
|
|
714
|
+
this.LightBulb.Saturation = value;
|
|
796
715
|
this.doCeilingLightUpdate.next();
|
|
797
716
|
}
|
|
798
717
|
async updateHomeKitCharacteristics() {
|
|
799
|
-
if (this.On === undefined) {
|
|
800
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.On}`);
|
|
718
|
+
if (this.LightBulb.On === undefined) {
|
|
719
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} On: ${this.LightBulb.On}`);
|
|
801
720
|
}
|
|
802
721
|
else {
|
|
803
|
-
this.accessory.context.On = this.On;
|
|
804
|
-
this.
|
|
805
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.On}`);
|
|
722
|
+
this.accessory.context.On = this.LightBulb.On;
|
|
723
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.On, this.LightBulb.On);
|
|
724
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic On: ${this.LightBulb.On}`);
|
|
806
725
|
}
|
|
807
|
-
if (this.Brightness === undefined) {
|
|
808
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.Brightness}`);
|
|
726
|
+
if (this.LightBulb.Brightness === undefined) {
|
|
727
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Brightness: ${this.LightBulb.Brightness}`);
|
|
809
728
|
}
|
|
810
729
|
else {
|
|
811
|
-
this.accessory.context.Brightness = this.Brightness;
|
|
812
|
-
this.
|
|
813
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Brightness: ${this.Brightness}`);
|
|
730
|
+
this.accessory.context.Brightness = this.LightBulb.Brightness;
|
|
731
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Brightness, this.LightBulb.Brightness);
|
|
732
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Brightness: ${this.LightBulb.Brightness}`);
|
|
814
733
|
}
|
|
815
|
-
if (this.ColorTemperature === undefined) {
|
|
816
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.ColorTemperature}`);
|
|
734
|
+
if (this.LightBulb.ColorTemperature === undefined) {
|
|
735
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} ColorTemperature: ${this.LightBulb.ColorTemperature}`);
|
|
817
736
|
}
|
|
818
737
|
else {
|
|
819
|
-
this.accessory.context.ColorTemperature = this.ColorTemperature;
|
|
820
|
-
this.
|
|
821
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}
|
|
738
|
+
this.accessory.context.ColorTemperature = this.LightBulb.ColorTemperature;
|
|
739
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.ColorTemperature, this.LightBulb.ColorTemperature);
|
|
740
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName}`
|
|
741
|
+
+ ` updateCharacteristic ColorTemperature: ${this.LightBulb.ColorTemperature}`);
|
|
822
742
|
}
|
|
823
|
-
if (this.Hue === undefined) {
|
|
824
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.Hue}`);
|
|
743
|
+
if (this.LightBulb.Hue === undefined) {
|
|
744
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Hue: ${this.LightBulb.Hue}`);
|
|
825
745
|
}
|
|
826
746
|
else {
|
|
827
|
-
this.accessory.context.Hue = this.Hue;
|
|
828
|
-
this.
|
|
829
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Hue: ${this.Hue}`);
|
|
747
|
+
this.accessory.context.Hue = this.LightBulb.Hue;
|
|
748
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Hue, this.LightBulb.Hue);
|
|
749
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Hue: ${this.LightBulb.Hue}`);
|
|
830
750
|
}
|
|
831
|
-
if (this.Saturation === undefined) {
|
|
832
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.Saturation}`);
|
|
751
|
+
if (this.LightBulb.Saturation === undefined) {
|
|
752
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Saturation: ${this.LightBulb.Saturation}`);
|
|
833
753
|
}
|
|
834
754
|
else {
|
|
835
|
-
this.accessory.context.Saturation = this.Saturation;
|
|
836
|
-
this.
|
|
837
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Saturation: ${this.Saturation}`);
|
|
755
|
+
this.accessory.context.Saturation = this.LightBulb.Saturation;
|
|
756
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Saturation, this.LightBulb.Saturation);
|
|
757
|
+
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} updateCharacteristic Saturation: ${this.LightBulb.Saturation}`);
|
|
838
758
|
}
|
|
839
759
|
}
|
|
840
760
|
async adaptiveLighting(device) {
|
|
@@ -847,34 +767,6 @@ export class CeilingLight {
|
|
|
847
767
|
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} adaptiveLightingShift: ${this.adaptiveLightingShift}`);
|
|
848
768
|
}
|
|
849
769
|
}
|
|
850
|
-
async stopScanning(switchbot) {
|
|
851
|
-
switchbot.stopScan();
|
|
852
|
-
if (this.BLE_IsConnected) {
|
|
853
|
-
await this.BLEparseStatus();
|
|
854
|
-
await this.updateHomeKitCharacteristics();
|
|
855
|
-
}
|
|
856
|
-
else {
|
|
857
|
-
await this.BLERefreshConnection(switchbot);
|
|
858
|
-
}
|
|
859
|
-
}
|
|
860
|
-
async getCustomBLEAddress(switchbot) {
|
|
861
|
-
if (this.device.customBLEaddress && this.deviceLogging.includes('debug')) {
|
|
862
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} customBLEaddress: ${this.device.customBLEaddress}`);
|
|
863
|
-
(async () => {
|
|
864
|
-
// Start to monitor advertisement packets
|
|
865
|
-
await switchbot.startScan({
|
|
866
|
-
model: 'u',
|
|
867
|
-
});
|
|
868
|
-
// Set an event handler
|
|
869
|
-
switchbot.onadvertisement = (ad) => {
|
|
870
|
-
this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} ad: ${JSON.stringify(ad, null, ' ')}`);
|
|
871
|
-
};
|
|
872
|
-
await sleep(10000);
|
|
873
|
-
// Stop to monitor
|
|
874
|
-
switchbot.stopScan();
|
|
875
|
-
})();
|
|
876
|
-
}
|
|
877
|
-
}
|
|
878
770
|
async BLEPushConnection() {
|
|
879
771
|
if (this.platform.config.credentials?.token && this.device.connectionType === 'BLE/OpenAPI') {
|
|
880
772
|
this.warnLog(`${this.device.deviceType}: ${this.accessory.displayName} Using OpenAPI Connection to Push Changes`);
|
|
@@ -889,275 +781,17 @@ export class CeilingLight {
|
|
|
889
781
|
await this.openAPIRefreshStatus();
|
|
890
782
|
}
|
|
891
783
|
}
|
|
892
|
-
async retry({ max, fn }) {
|
|
893
|
-
return fn().catch(async (e) => {
|
|
894
|
-
if (max === 0) {
|
|
895
|
-
throw e;
|
|
896
|
-
}
|
|
897
|
-
this.infoLog(e);
|
|
898
|
-
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Retrying`);
|
|
899
|
-
await sleep(1000);
|
|
900
|
-
return this.retry({ max: max - 1, fn });
|
|
901
|
-
});
|
|
902
|
-
}
|
|
903
|
-
maxRetry() {
|
|
904
|
-
if (this.device.maxRetry) {
|
|
905
|
-
return this.device.maxRetry;
|
|
906
|
-
}
|
|
907
|
-
else {
|
|
908
|
-
return 5;
|
|
909
|
-
}
|
|
910
|
-
}
|
|
911
|
-
minStep(device) {
|
|
912
|
-
if (device.ceilinglight?.set_minStep) {
|
|
913
|
-
this.set_minStep = device.ceilinglight?.set_minStep;
|
|
914
|
-
}
|
|
915
|
-
else {
|
|
916
|
-
this.set_minStep = 1;
|
|
917
|
-
}
|
|
918
|
-
return this.set_minStep;
|
|
919
|
-
}
|
|
920
|
-
async scan(device) {
|
|
921
|
-
if (device.scanDuration) {
|
|
922
|
-
this.scanDuration = this.accessory.context.scanDuration = device.scanDuration;
|
|
923
|
-
if (this.BLE) {
|
|
924
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config scanDuration: ${this.scanDuration}`);
|
|
925
|
-
}
|
|
926
|
-
}
|
|
927
|
-
else {
|
|
928
|
-
this.scanDuration = this.accessory.context.scanDuration = 1;
|
|
929
|
-
if (this.BLE) {
|
|
930
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Default scanDuration: ${this.scanDuration}`);
|
|
931
|
-
}
|
|
932
|
-
}
|
|
933
|
-
}
|
|
934
|
-
async statusCode(statusCode) {
|
|
935
|
-
switch (statusCode) {
|
|
936
|
-
case 151:
|
|
937
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command not supported by this deviceType, statusCode: ${statusCode}`);
|
|
938
|
-
break;
|
|
939
|
-
case 152:
|
|
940
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device not found, statusCode: ${statusCode}`);
|
|
941
|
-
break;
|
|
942
|
-
case 160:
|
|
943
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Command is not supported, statusCode: ${statusCode}`);
|
|
944
|
-
break;
|
|
945
|
-
case 161:
|
|
946
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device is offline, statusCode: ${statusCode}`);
|
|
947
|
-
this.offlineOff();
|
|
948
|
-
break;
|
|
949
|
-
case 171:
|
|
950
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Hub Device is offline, statusCode: ${statusCode}. ` +
|
|
951
|
-
`Hub: ${this.device.hubDeviceId}`);
|
|
952
|
-
this.offlineOff();
|
|
953
|
-
break;
|
|
954
|
-
case 190:
|
|
955
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Device internal error due to device states not synchronized with server,` +
|
|
956
|
-
` Or command format is invalid, statusCode: ${statusCode}`);
|
|
957
|
-
break;
|
|
958
|
-
case 100:
|
|
959
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Command successfully sent, statusCode: ${statusCode}`);
|
|
960
|
-
break;
|
|
961
|
-
case 200:
|
|
962
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Request successful, statusCode: ${statusCode}`);
|
|
963
|
-
break;
|
|
964
|
-
case 400:
|
|
965
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Bad Request, The client has issued an invalid request. `
|
|
966
|
-
+ `This is commonly used to specify validation errors in a request payload, statusCode: ${statusCode}`);
|
|
967
|
-
break;
|
|
968
|
-
case 401:
|
|
969
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unauthorized, Authorization for the API is required, `
|
|
970
|
-
+ `but the request has not been authenticated, statusCode: ${statusCode}`);
|
|
971
|
-
break;
|
|
972
|
-
case 403:
|
|
973
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Forbidden, The request has been authenticated but does not `
|
|
974
|
-
+ `have appropriate permissions, or a requested resource is not found, statusCode: ${statusCode}`);
|
|
975
|
-
break;
|
|
976
|
-
case 404:
|
|
977
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Found, Specifies the requested path does not exist, `
|
|
978
|
-
+ `statusCode: ${statusCode}`);
|
|
979
|
-
break;
|
|
980
|
-
case 406:
|
|
981
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Not Acceptable, The client has requested a MIME type via `
|
|
982
|
-
+ `the Accept header for a value not supported by the server, statusCode: ${statusCode}`);
|
|
983
|
-
break;
|
|
984
|
-
case 415:
|
|
985
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unsupported Media Type, The client has defined a contentType `
|
|
986
|
-
+ `header that is not supported by the server, statusCode: ${statusCode}`);
|
|
987
|
-
break;
|
|
988
|
-
case 422:
|
|
989
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Unprocessable Entity, The client has made a valid request, `
|
|
990
|
-
+ `but the server cannot process it. This is often used for APIs for which certain limits have been exceeded, statusCode: ${statusCode}`);
|
|
991
|
-
break;
|
|
992
|
-
case 429:
|
|
993
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Too Many Requests, The client has exceeded the number of `
|
|
994
|
-
+ `requests allowed for a given time window, statusCode: ${statusCode}`);
|
|
995
|
-
break;
|
|
996
|
-
case 500:
|
|
997
|
-
this.errorLog(`${this.device.deviceType}: ${this.accessory.displayName} Internal Server Error, An unexpected error on the SmartThings `
|
|
998
|
-
+ `servers has occurred. These errors should be rare, statusCode: ${statusCode}`);
|
|
999
|
-
break;
|
|
1000
|
-
default:
|
|
1001
|
-
this.infoLog(`${this.device.deviceType}: ${this.accessory.displayName} Unknown statusCode: ` +
|
|
1002
|
-
`${statusCode}, Submit Bugs Here: ' + 'https://tinyurl.com/SwitchBotBug`);
|
|
1003
|
-
}
|
|
1004
|
-
}
|
|
1005
784
|
async offlineOff() {
|
|
1006
785
|
if (this.device.offline) {
|
|
1007
|
-
|
|
1008
|
-
await this.updateHomeKitCharacteristics();
|
|
786
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.On, false);
|
|
1009
787
|
}
|
|
1010
788
|
}
|
|
1011
789
|
apiError(e) {
|
|
1012
|
-
this.
|
|
1013
|
-
this.
|
|
1014
|
-
this.
|
|
1015
|
-
this.
|
|
1016
|
-
this.
|
|
1017
|
-
}
|
|
1018
|
-
async deviceContext() {
|
|
1019
|
-
if (this.On === undefined) {
|
|
1020
|
-
this.On = false;
|
|
1021
|
-
}
|
|
1022
|
-
else {
|
|
1023
|
-
this.On = this.accessory.context.On;
|
|
1024
|
-
}
|
|
1025
|
-
if (this.Hue === undefined) {
|
|
1026
|
-
this.Hue = 0;
|
|
1027
|
-
}
|
|
1028
|
-
else {
|
|
1029
|
-
this.Hue = this.accessory.context.Hue;
|
|
1030
|
-
}
|
|
1031
|
-
if (this.Brightness === undefined) {
|
|
1032
|
-
this.Brightness = 0;
|
|
1033
|
-
}
|
|
1034
|
-
else {
|
|
1035
|
-
this.Brightness = this.accessory.context.Brightness;
|
|
1036
|
-
}
|
|
1037
|
-
if (this.Brightness === undefined) {
|
|
1038
|
-
this.Saturation = 0;
|
|
1039
|
-
}
|
|
1040
|
-
else {
|
|
1041
|
-
this.Saturation = this.accessory.context.Saturation;
|
|
1042
|
-
}
|
|
1043
|
-
if (this.ColorTemperature === undefined) {
|
|
1044
|
-
this.ColorTemperature = 140;
|
|
1045
|
-
}
|
|
1046
|
-
else {
|
|
1047
|
-
this.ColorTemperature = this.accessory.context.ColorTemperature;
|
|
1048
|
-
}
|
|
1049
|
-
this.minKelvin = 2000;
|
|
1050
|
-
this.maxKelvin = 9000;
|
|
1051
|
-
if (this.FirmwareRevision === undefined) {
|
|
1052
|
-
this.FirmwareRevision = this.platform.version;
|
|
1053
|
-
this.accessory.context.FirmwareRevision = this.FirmwareRevision;
|
|
1054
|
-
}
|
|
1055
|
-
}
|
|
1056
|
-
async refreshRate(device) {
|
|
1057
|
-
if (device.refreshRate) {
|
|
1058
|
-
this.deviceRefreshRate = this.accessory.context.refreshRate = device.refreshRate;
|
|
1059
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config refreshRate: ${this.deviceRefreshRate}`);
|
|
1060
|
-
}
|
|
1061
|
-
else if (this.platform.config.options.refreshRate) {
|
|
1062
|
-
this.deviceRefreshRate = this.accessory.context.refreshRate = this.platform.config.options.refreshRate;
|
|
1063
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config refreshRate: ${this.deviceRefreshRate}`);
|
|
1064
|
-
}
|
|
1065
|
-
}
|
|
1066
|
-
async deviceConfig(device) {
|
|
1067
|
-
let config = {};
|
|
1068
|
-
if (device.ceilinglight) {
|
|
1069
|
-
config = device.ceilinglight;
|
|
1070
|
-
}
|
|
1071
|
-
if (device.connectionType !== undefined) {
|
|
1072
|
-
config['connectionType'] = device.connectionType;
|
|
1073
|
-
}
|
|
1074
|
-
if (device.external !== undefined) {
|
|
1075
|
-
config['external'] = device.external;
|
|
1076
|
-
}
|
|
1077
|
-
if (device.logging !== undefined) {
|
|
1078
|
-
config['logging'] = device.logging;
|
|
1079
|
-
}
|
|
1080
|
-
if (device.refreshRate !== undefined) {
|
|
1081
|
-
config['refreshRate'] = device.refreshRate;
|
|
1082
|
-
}
|
|
1083
|
-
if (device.scanDuration !== undefined) {
|
|
1084
|
-
config['scanDuration'] = device.scanDuration;
|
|
1085
|
-
}
|
|
1086
|
-
if (device.offline !== undefined) {
|
|
1087
|
-
config['offline'] = device.offline;
|
|
1088
|
-
}
|
|
1089
|
-
if (device.maxRetry !== undefined) {
|
|
1090
|
-
config['maxRetry'] = device.maxRetry;
|
|
1091
|
-
}
|
|
1092
|
-
if (device.webhook !== undefined) {
|
|
1093
|
-
config['webhook'] = device.webhook;
|
|
1094
|
-
}
|
|
1095
|
-
if (Object.entries(config).length !== 0) {
|
|
1096
|
-
this.debugWarnLog(`${this.device.deviceType}: ${this.accessory.displayName} Config: ${JSON.stringify(config)}`);
|
|
1097
|
-
}
|
|
1098
|
-
}
|
|
1099
|
-
async deviceLogs(device) {
|
|
1100
|
-
if (this.platform.debugMode) {
|
|
1101
|
-
this.deviceLogging = this.accessory.context.logging = 'debugMode';
|
|
1102
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Debug Mode Logging: ${this.deviceLogging}`);
|
|
1103
|
-
}
|
|
1104
|
-
else if (device.logging) {
|
|
1105
|
-
this.deviceLogging = this.accessory.context.logging = device.logging;
|
|
1106
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Device Config Logging: ${this.deviceLogging}`);
|
|
1107
|
-
}
|
|
1108
|
-
else if (this.platform.config.options?.logging) {
|
|
1109
|
-
this.deviceLogging = this.accessory.context.logging = this.platform.config.options?.logging;
|
|
1110
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Using Platform Config Logging: ${this.deviceLogging}`);
|
|
1111
|
-
}
|
|
1112
|
-
else {
|
|
1113
|
-
this.deviceLogging = this.accessory.context.logging = 'standard';
|
|
1114
|
-
this.debugLog(`${this.device.deviceType}: ${this.accessory.displayName} Logging Not Set, Using: ${this.deviceLogging}`);
|
|
1115
|
-
}
|
|
1116
|
-
}
|
|
1117
|
-
/**
|
|
1118
|
-
* Logging for Device
|
|
1119
|
-
*/
|
|
1120
|
-
infoLog(...log) {
|
|
1121
|
-
if (this.enablingDeviceLogging()) {
|
|
1122
|
-
this.platform.log.info(String(...log));
|
|
1123
|
-
}
|
|
1124
|
-
}
|
|
1125
|
-
warnLog(...log) {
|
|
1126
|
-
if (this.enablingDeviceLogging()) {
|
|
1127
|
-
this.platform.log.warn(String(...log));
|
|
1128
|
-
}
|
|
1129
|
-
}
|
|
1130
|
-
debugWarnLog(...log) {
|
|
1131
|
-
if (this.enablingDeviceLogging()) {
|
|
1132
|
-
if (this.deviceLogging?.includes('debug')) {
|
|
1133
|
-
this.platform.log.warn('[DEBUG]', String(...log));
|
|
1134
|
-
}
|
|
1135
|
-
}
|
|
1136
|
-
}
|
|
1137
|
-
errorLog(...log) {
|
|
1138
|
-
if (this.enablingDeviceLogging()) {
|
|
1139
|
-
this.platform.log.error(String(...log));
|
|
1140
|
-
}
|
|
1141
|
-
}
|
|
1142
|
-
debugErrorLog(...log) {
|
|
1143
|
-
if (this.enablingDeviceLogging()) {
|
|
1144
|
-
if (this.deviceLogging?.includes('debug')) {
|
|
1145
|
-
this.platform.log.error('[DEBUG]', String(...log));
|
|
1146
|
-
}
|
|
1147
|
-
}
|
|
1148
|
-
}
|
|
1149
|
-
debugLog(...log) {
|
|
1150
|
-
if (this.enablingDeviceLogging()) {
|
|
1151
|
-
if (this.deviceLogging === 'debug') {
|
|
1152
|
-
this.platform.log.info('[DEBUG]', String(...log));
|
|
1153
|
-
}
|
|
1154
|
-
else {
|
|
1155
|
-
this.platform.log.debug(String(...log));
|
|
1156
|
-
}
|
|
1157
|
-
}
|
|
1158
|
-
}
|
|
1159
|
-
enablingDeviceLogging() {
|
|
1160
|
-
return this.deviceLogging.includes('debug') || this.deviceLogging === 'standard';
|
|
790
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.On, e);
|
|
791
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Hue, e);
|
|
792
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Brightness, e);
|
|
793
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.Saturation, e);
|
|
794
|
+
this.LightBulb.Service.updateCharacteristic(this.hap.Characteristic.ColorTemperature, e);
|
|
1161
795
|
}
|
|
1162
796
|
}
|
|
1163
797
|
//# sourceMappingURL=ceilinglight.js.map
|