@marcel2215/homebridge-supla-plugin 2.1.31 → 2.1.32
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.
|
@@ -12,6 +12,7 @@ export declare class DimmerAccessory {
|
|
|
12
12
|
private overcurrent?;
|
|
13
13
|
private hasState;
|
|
14
14
|
private hasBrightness;
|
|
15
|
+
private readonly useLegacyCachedBaseline;
|
|
15
16
|
private updateTimer?;
|
|
16
17
|
constructor(platform: SuplaPlatform, accessory: PlatformAccessory, context: SuplaChannelContext);
|
|
17
18
|
handleOnGet(): Promise<CharacteristicValue>;
|
|
@@ -19,6 +20,7 @@ export declare class DimmerAccessory {
|
|
|
19
20
|
handleBrightnessGet(): Promise<CharacteristicValue>;
|
|
20
21
|
handleBrightnessSet(value: CharacteristicValue): Promise<void>;
|
|
21
22
|
private clearUpdateTimer;
|
|
23
|
+
private restoreLegacyCachedBaseline;
|
|
22
24
|
private assertAvailable;
|
|
23
25
|
}
|
|
24
26
|
//# sourceMappingURL=DimmerAccessory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DimmerAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/DimmerAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAC,mBAAmB,EAAC,MAAM,gCAAgC,CAAC;AAEnE,qBAAa,eAAe;
|
|
1
|
+
{"version":3,"file":"DimmerAccessory.d.ts","sourceRoot":"","sources":["../../src/Accesories/DimmerAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAC,mBAAmB,EAAC,MAAM,gCAAgC,CAAC;AAEnE,qBAAa,eAAe;IAYxB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAb1B,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,UAAU,CAAK;IACvB,OAAO,CAAC,SAAS,CAAC,CAAU;IAC5B,OAAO,CAAC,WAAW,CAAC,CAAU;IAC9B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAU;IAClD,OAAO,CAAC,WAAW,CAAC,CAAiB;gBAGlB,QAAQ,EAAE,aAAa,EACvB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,mBAAmB;IAqGzC,WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAK3C,WAAW,CAAC,KAAK,EAAE,mBAAmB;IActC,mBAAmB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAKnD,mBAAmB,CAAC,KAAK,EAAE,mBAAmB;IAUpD,OAAO,CAAC,gBAAgB;IAOxB,OAAO,CAAC,2BAA2B;IA2BnC,OAAO,CAAC,eAAe;CAOxB"}
|
|
@@ -15,11 +15,17 @@ class DimmerAccessory {
|
|
|
15
15
|
.setCharacteristic(this.platform.Characteristic.Model, 'DimmerController');
|
|
16
16
|
this.service = this.accessory.getService(this.platform.Service.Lightbulb)
|
|
17
17
|
|| this.accessory.addService(this.platform.Service.Lightbulb);
|
|
18
|
+
this.useLegacyCachedBaseline = this.context.channelFunction?.trim().toUpperCase() === 'NONE';
|
|
18
19
|
this.service.setCharacteristic(this.platform.Characteristic.Name, accessory.displayName);
|
|
19
|
-
this.service.getCharacteristic(this.platform.Characteristic.On)
|
|
20
|
+
const onCharacteristic = this.service.getCharacteristic(this.platform.Characteristic.On);
|
|
21
|
+
const brightnessCharacteristic = this.service.getCharacteristic(this.platform.Characteristic.Brightness);
|
|
22
|
+
if (this.useLegacyCachedBaseline) {
|
|
23
|
+
this.restoreLegacyCachedBaseline(onCharacteristic.value, brightnessCharacteristic.value);
|
|
24
|
+
}
|
|
25
|
+
onCharacteristic
|
|
20
26
|
.onGet(this.handleOnGet.bind(this))
|
|
21
27
|
.onSet(this.handleOnSet.bind(this));
|
|
22
|
-
|
|
28
|
+
brightnessCharacteristic
|
|
23
29
|
.onGet(this.handleBrightnessGet.bind(this))
|
|
24
30
|
.onSet(this.handleBrightnessSet.bind(this));
|
|
25
31
|
this.platform.registerOwnerCleanup(this.accessory.UUID, () => {
|
|
@@ -52,8 +58,10 @@ class DimmerAccessory {
|
|
|
52
58
|
}
|
|
53
59
|
this.connected = connected;
|
|
54
60
|
if (!connected) {
|
|
55
|
-
this.
|
|
56
|
-
|
|
61
|
+
if (!this.useLegacyCachedBaseline) {
|
|
62
|
+
this.hasState = false;
|
|
63
|
+
this.hasBrightness = false;
|
|
64
|
+
}
|
|
57
65
|
this.overcurrent = undefined;
|
|
58
66
|
this.clearUpdateTimer();
|
|
59
67
|
}
|
|
@@ -68,8 +76,10 @@ class DimmerAccessory {
|
|
|
68
76
|
this.platform.registerMqttTransportHandler?.((transportConnected) => {
|
|
69
77
|
this.connected = transportConnected ? undefined : false;
|
|
70
78
|
if (!transportConnected) {
|
|
71
|
-
this.
|
|
72
|
-
|
|
79
|
+
if (!this.useLegacyCachedBaseline) {
|
|
80
|
+
this.hasState = false;
|
|
81
|
+
this.hasBrightness = false;
|
|
82
|
+
}
|
|
73
83
|
this.overcurrent = undefined;
|
|
74
84
|
this.clearUpdateTimer();
|
|
75
85
|
}
|
|
@@ -103,6 +113,28 @@ class DimmerAccessory {
|
|
|
103
113
|
this.updateTimer = undefined;
|
|
104
114
|
}
|
|
105
115
|
}
|
|
116
|
+
restoreLegacyCachedBaseline(onValue, brightnessValue) {
|
|
117
|
+
const cachedState = typeof onValue === 'boolean'
|
|
118
|
+
? onValue
|
|
119
|
+
: onValue === 1
|
|
120
|
+
? true
|
|
121
|
+
: onValue === 0
|
|
122
|
+
? false
|
|
123
|
+
: undefined;
|
|
124
|
+
if (cachedState !== undefined) {
|
|
125
|
+
this.state = cachedState;
|
|
126
|
+
this.hasState = true;
|
|
127
|
+
this.service.updateCharacteristic(this.platform.Characteristic.On, cachedState);
|
|
128
|
+
}
|
|
129
|
+
if (typeof brightnessValue === 'number'
|
|
130
|
+
&& Number.isFinite(brightnessValue)
|
|
131
|
+
&& brightnessValue >= 0
|
|
132
|
+
&& brightnessValue <= 100) {
|
|
133
|
+
this.brightness = brightnessValue;
|
|
134
|
+
this.hasBrightness = true;
|
|
135
|
+
this.service.updateCharacteristic(this.platform.Characteristic.Brightness, brightnessValue);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
106
138
|
assertAvailable(hasValue) {
|
|
107
139
|
if (this.connected === false || !hasValue || this.overcurrent === true) {
|
|
108
140
|
throw new this.platform.api.hap.HapStatusError(-70402 /* this.platform.api.hap.HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DimmerAccessory.js","sourceRoot":"","sources":["../../src/Accesories/DimmerAccessory.ts"],"names":[],"mappings":";;;AAKA,MAAa,eAAe;
|
|
1
|
+
{"version":3,"file":"DimmerAccessory.js","sourceRoot":"","sources":["../../src/Accesories/DimmerAccessory.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED