homebridge-easy-mqtt 1.5.4 → 1.5.5-beta.1
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/CHANGELOG.md +9 -4
- package/config.schema.json +59 -0
- package/dist/accessory/abstract/common.d.ts +5 -3
- package/dist/accessory/abstract/common.js +63 -3
- package/dist/accessory/abstract/common.js.map +1 -1
- package/dist/accessory/climate/active.js +1 -1
- package/dist/accessory/climate/active.js.map +1 -1
- package/dist/accessory/onoff/onoff.js +2 -2
- package/dist/accessory/onoff/onoff.js.map +1 -1
- package/dist/accessory/sensor/carbonDioxide.js +1 -1
- package/dist/accessory/sensor/carbonDioxide.js.map +1 -1
- package/dist/accessory/sensor/carbonMonoxide.js +1 -1
- package/dist/accessory/sensor/carbonMonoxide.js.map +1 -1
- package/dist/accessory/sensor/contact.d.ts +3 -1
- package/dist/accessory/sensor/contact.js +22 -9
- package/dist/accessory/sensor/contact.js.map +1 -1
- package/dist/accessory/sensor/leak.js +1 -1
- package/dist/accessory/sensor/leak.js.map +1 -1
- package/dist/accessory/sensor/motion.js +1 -1
- package/dist/accessory/sensor/motion.js.map +1 -1
- package/dist/accessory/sensor/occupancy.js +1 -1
- package/dist/accessory/sensor/occupancy.js.map +1 -1
- package/dist/accessory/sensor/smoke.js +1 -1
- package/dist/accessory/sensor/smoke.js.map +1 -1
- package/dist/homebridge-ui/public/index.html +1 -1
- package/dist/homebridge-ui/public/ui.js +1 -1
- package/dist/i18n/de.d.ts +13 -0
- package/dist/i18n/en.d.ts +13 -0
- package/dist/i18n/en.js +13 -0
- package/dist/i18n/en.js.map +1 -1
- package/dist/i18n/fr.d.ts +13 -0
- package/dist/i18n/i18n.d.ts +13 -0
- package/dist/i18n/it.d.ts +13 -0
- package/dist/i18n/ro.d.ts +13 -0
- package/dist/i18n/template.d.ts +13 -0
- package/dist/i18n/vi.d.ts +13 -0
- package/dist/model/enums.d.ts +6 -0
- package/dist/model/enums.js +7 -0
- package/dist/model/enums.js.map +1 -1
- package/dist/model/types.d.ts +17 -10
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,11 +2,19 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to homebridge-dummy will be documented in this file.
|
|
4
4
|
|
|
5
|
-
## 1.5.
|
|
5
|
+
## 1.5.5-beta.1 (2025-12-02)
|
|
6
6
|
|
|
7
7
|
### Help Requested
|
|
8
8
|
I recently created a new [Wiki](https://github.com/mpatfield/homebridge-easy-mqtt/wiki/MQTTThing) to provide config examples for users migrating from MQTTThing. If you have an example of old/new config you'd be willing to share, please [post a message on Discord](https://discord.com/channels/432663330281226270/1412178951295467542) or [open a ticket](https://github.com/mpatfield/homebridge-easy-mqtt/issues/new/choose).
|
|
9
9
|
|
|
10
|
+
### Added
|
|
11
|
+
- [Auto-Reset](https://github.com/mpatfield/homebridge-easy-mqtt/wiki/Auto%E2%80%90Reset) timer for Sensors, Switches, Outlets, Lightbulbs, Fans, Heater/Cooler, and Purifier
|
|
12
|
+
|
|
13
|
+
### Notes
|
|
14
|
+
Would you like to see Homebridge Easy MQTT in your language? Please consider [getting involved](https://github.com/mpatfield/homebridge-easy-mqtt/issues/4). No coding experience required!
|
|
15
|
+
|
|
16
|
+
## 1.5.4 (2025-11-24)
|
|
17
|
+
|
|
10
18
|
### Added
|
|
11
19
|
- Create a multi-button [`StatelessProgrammableSwitch`](https://github.com/mpatfield/homebridge-easy-mqtt/wiki/StatelessProgrammableSwitch) using comma-separated value lists
|
|
12
20
|
- ⚠️ This *should* be backwards compatible with existing single-button switches, but please [create a ticket](https://github.com/mpatfield/homebridge-easy-mqtt/issues/new/choose) if you have problems
|
|
@@ -14,9 +22,6 @@ I recently created a new [Wiki](https://github.com/mpatfield/homebridge-easy-mqt
|
|
|
14
22
|
### Changed
|
|
15
23
|
- Updated dependencies
|
|
16
24
|
|
|
17
|
-
### Notes
|
|
18
|
-
Would you like to see Homebridge Easy MQTT in your language? Please consider [getting involved](https://github.com/mpatfield/homebridge-easy-mqtt/issues/4). No coding experience required!
|
|
19
|
-
|
|
20
25
|
## 1.5.3 (2025-11-14)
|
|
21
26
|
|
|
22
27
|
### Added
|
package/config.schema.json
CHANGED
|
@@ -160,6 +160,47 @@
|
|
|
160
160
|
"enum": ["GENERIC_VALVE", "IRRIGATION", "SHOWER_HEAD", "WATER_FAUCET"],
|
|
161
161
|
"enumNames": ["${config.enumNames.valveGeneric}", "${config.enumNames.valveIrrigation}", "${config.enumNames.valveShower}", "${config.enumNames.valveFaucet}"]
|
|
162
162
|
},
|
|
163
|
+
"autoReset": {
|
|
164
|
+
"type": "object",
|
|
165
|
+
"properties": {
|
|
166
|
+
"time": {
|
|
167
|
+
"type": "number",
|
|
168
|
+
"title": "${config.title.time}"
|
|
169
|
+
},
|
|
170
|
+
"units": {
|
|
171
|
+
"type": "string",
|
|
172
|
+
"title": "${config.title.units}",
|
|
173
|
+
"enum": ["MILLISECONDS", "SECONDS", "MINUTES", "HOURS"],
|
|
174
|
+
"enumNames": ["${config.enumNames.milliseconds}", "${config.enumNames.seconds}", "${config.enumNames.minutes}", "${config.enumNames.hours}"]
|
|
175
|
+
}
|
|
176
|
+
},
|
|
177
|
+
"allOf": [
|
|
178
|
+
{
|
|
179
|
+
"if": {
|
|
180
|
+
"properties": {
|
|
181
|
+
"time": {
|
|
182
|
+
}
|
|
183
|
+
},
|
|
184
|
+
"required": ["time"]
|
|
185
|
+
},
|
|
186
|
+
"then": {
|
|
187
|
+
"required": ["units"]
|
|
188
|
+
}
|
|
189
|
+
},
|
|
190
|
+
{
|
|
191
|
+
"if": {
|
|
192
|
+
"properties": {
|
|
193
|
+
"units" : {
|
|
194
|
+
}
|
|
195
|
+
},
|
|
196
|
+
"required": [ "units" ]
|
|
197
|
+
},
|
|
198
|
+
"then": {
|
|
199
|
+
"required": [ "time"]
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
]
|
|
203
|
+
},
|
|
163
204
|
"topicGetBatteryLevel": {
|
|
164
205
|
"type": "string",
|
|
165
206
|
"title": "${config.title.topicGetBatteryLevel}"
|
|
@@ -1812,6 +1853,24 @@
|
|
|
1812
1853
|
}
|
|
1813
1854
|
]
|
|
1814
1855
|
},
|
|
1856
|
+
{
|
|
1857
|
+
"type": "div",
|
|
1858
|
+
"displayFlex": true,
|
|
1859
|
+
"flex-direction": "row",
|
|
1860
|
+
"condition": {
|
|
1861
|
+
"functionBody": "return ['AirPurifier', 'CarbonDioxideSensor', 'CarbonMonoxideSensor', 'ContactSensor', 'Fanv2', 'HeaterCooler', 'LeakSensor', 'Lightbulb', 'MotionSensor', 'OccupancySensor', 'Outlet', 'SmokeSensor', 'Switch'].includes(model.accessories?.[arguments[1]]?.info?.type);"
|
|
1862
|
+
},
|
|
1863
|
+
"items": [
|
|
1864
|
+
{
|
|
1865
|
+
"key": "accessories[].autoReset.time",
|
|
1866
|
+
"flex": "0 0 25%"
|
|
1867
|
+
},
|
|
1868
|
+
{
|
|
1869
|
+
"key": "accessories[].autoReset.units",
|
|
1870
|
+
"flex": "0 0 25%"
|
|
1871
|
+
}
|
|
1872
|
+
]
|
|
1873
|
+
},
|
|
1815
1874
|
{
|
|
1816
1875
|
"type": "fieldset",
|
|
1817
1876
|
"title": "${config.title.topics}",
|
|
@@ -22,6 +22,7 @@ export declare abstract class Common<C extends Assertable> {
|
|
|
22
22
|
protected abstract get config(): C;
|
|
23
23
|
protected abstract get identifier(): string;
|
|
24
24
|
protected abstract get useStoredProperties(): boolean;
|
|
25
|
+
private timeout?;
|
|
25
26
|
protected abstract publish(rawTopic: string, value: PrimitiveTypes): void;
|
|
26
27
|
protected assert(...keys: (keyof C)[]): boolean;
|
|
27
28
|
protected assertType(expectedType: Type, ...keys: (keyof C)[]): boolean;
|
|
@@ -36,20 +37,21 @@ export declare abstract class Common<C extends Assertable> {
|
|
|
36
37
|
protected setupSet(characteristicKey: CharacteristicKey, setTopicKey?: keyof C | undefined, onSetHandler?: CharacteristicSetHandler | undefined): void;
|
|
37
38
|
protected setupTopicless(characteristicKey: CharacteristicKey, defaultValue: CharacteristicValue, onSetCallback?: (value: CharacteristicValue) => (void)): Characteristic | undefined;
|
|
38
39
|
protected bindOnUpdateNumeric(key: CharacteristicKey, logTemplate: string, callback?: NumberCallback): OnUpdateHandler;
|
|
39
|
-
protected bindOnUpdateBoolean(key: CharacteristicKey, trueKey: keyof C, falseKey: keyof C, logTrue: string, logFalse: string, callback?: BooleanCallback): OnUpdateHandler;
|
|
40
|
+
protected bindOnUpdateBoolean(key: CharacteristicKey, trueKey: keyof C, falseKey: keyof C, logTrue: string, logFalse: string, allowAutoReset?: boolean, callback?: BooleanCallback): OnUpdateHandler;
|
|
40
41
|
protected bindOnUpdateBooleanSingle(key: CharacteristicKey, valueKey: keyof C, trueLog: string, falseLog: string, trueLogType?: LogType, falseLogType?: LogType): (_topic: string, value: PrimitiveTypes) => Promise<void>;
|
|
41
|
-
protected bindOnUpdateNumericBoolean(charKey: CharacteristicKey, valueKey: keyof C, logTrue: string, logFalse: string, callback?: NumberCallback): OnUpdateHandler;
|
|
42
|
+
protected bindOnUpdateNumericBoolean(charKey: CharacteristicKey, valueKey: keyof C, logTrue: string, logFalse: string, allowAutoReset?: boolean, callback?: NumberCallback): OnUpdateHandler;
|
|
42
43
|
protected bindOnUpdateTemperature<C extends TemperatureConfig>(config: C, charKey: CharacteristicKey, logTemplate: string, callback?: NumberCallback): OnUpdateHandler;
|
|
43
44
|
protected bindOnUpdateState(key: CharacteristicKey, states: Map<keyof C, CharacteristicValue>, strings: Map<CharacteristicValue, string>, unknownLog: string): (_topic: string, value: PrimitiveTypes) => Promise<void>;
|
|
44
45
|
private onSetNumeric;
|
|
45
46
|
protected bindOnSetNumeric(key: CharacteristicKey, topic: keyof C, logTemplate: string): (value: CharacteristicValue) => Promise<void>;
|
|
46
47
|
protected bindOnSetPercentOrValue(key: CharacteristicKey, topic: keyof C, maximum: number | undefined, logPercent: string, logValue: string): (value: CharacteristicValue) => Promise<void>;
|
|
47
|
-
protected bindOnSetBoolean(key: CharacteristicKey, setTopicKey: keyof C, trueValueKey: keyof C, falseValueKey: keyof C, trueValue: CharacteristicValue, trueLog: string, falseLog: string, callback?: BooleanCallback): (value: CharacteristicValue) => Promise<void>;
|
|
48
|
+
protected bindOnSetBoolean(key: CharacteristicKey, setTopicKey: keyof C, trueValueKey: keyof C, falseValueKey: keyof C, trueValue: CharacteristicValue, trueLog: string, falseLog: string, allowAutoReset?: boolean, callback?: BooleanCallback): (value: CharacteristicValue) => Promise<void>;
|
|
48
49
|
protected bindOnSetState(key: CharacteristicKey, setTopicKey: keyof C, states: Map<keyof C, CharacteristicValue>, strings: Map<CharacteristicValue, string>, badValueLog: string): (value: CharacteristicValue) => Promise<void>;
|
|
49
50
|
protected onUpdate(key: CharacteristicKey, value: CharacteristicValue, logString?: string | undefined): boolean;
|
|
50
51
|
protected onSet(key: CharacteristicKey, value: CharacteristicValue, publish: PrimitiveTypes, topic: keyof C, logString: string | undefined): void;
|
|
51
52
|
protected updateNumericValue(key: CharacteristicKey, delta: number): void;
|
|
52
53
|
protected characteristicFromKey(key: CharacteristicKey): any;
|
|
54
|
+
protected startTimeout(callback: () => void): void;
|
|
53
55
|
protected logIfDesired(message: string, ...parameters: string[]): void;
|
|
54
56
|
protected logIfDesired(level: LogType, message: string, ...parameters: string[]): void;
|
|
55
57
|
}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { EveCharacteristic, isEveCharacteristic } from '../characteristic/eve.js';
|
|
2
2
|
import { strings } from '../../i18n/i18n.js';
|
|
3
|
+
import { TimeUnits } from '../../model/enums.js';
|
|
3
4
|
import { LogType } from '../../tools/log.js';
|
|
4
5
|
import { toNumber, toPrimitive } from '../../tools/primitive.js';
|
|
5
6
|
import { Properties } from '../../tools/properties.js';
|
|
6
7
|
import { temperatureUnits, toCelsius } from '../../tools/temperature.js';
|
|
8
|
+
import { HOUR, MINUTE, SECOND } from '../../tools/time.js';
|
|
7
9
|
import { assert, assertType } from '../../tools/validation.js';
|
|
8
10
|
export class Common {
|
|
9
11
|
name;
|
|
@@ -11,6 +13,7 @@ export class Common {
|
|
|
11
13
|
constructor(name) {
|
|
12
14
|
this.name = name;
|
|
13
15
|
}
|
|
16
|
+
timeout;
|
|
14
17
|
assert(...keys) {
|
|
15
18
|
return assert(this.log, this.name, this.config, ...keys);
|
|
16
19
|
}
|
|
@@ -139,7 +142,7 @@ export class Common {
|
|
|
139
142
|
callback?.(value);
|
|
140
143
|
}).bind(this);
|
|
141
144
|
}
|
|
142
|
-
bindOnUpdateBoolean(key, trueKey, falseKey, logTrue, logFalse, callback) {
|
|
145
|
+
bindOnUpdateBoolean(key, trueKey, falseKey, logTrue, logFalse, allowAutoReset = false, callback) {
|
|
143
146
|
return (async (_topic, value) => {
|
|
144
147
|
let bool = undefined;
|
|
145
148
|
switch (value) {
|
|
@@ -156,6 +159,12 @@ export class Common {
|
|
|
156
159
|
const logString = bool ? logTrue : logFalse;
|
|
157
160
|
this.onUpdate(key, bool, logString);
|
|
158
161
|
callback?.(bool);
|
|
162
|
+
if (allowAutoReset && bool) {
|
|
163
|
+
this.startTimeout(() => {
|
|
164
|
+
this.onUpdate(key, false, logFalse);
|
|
165
|
+
callback?.(false);
|
|
166
|
+
});
|
|
167
|
+
}
|
|
159
168
|
}).bind(this);
|
|
160
169
|
}
|
|
161
170
|
bindOnUpdateBooleanSingle(key, valueKey, trueLog, falseLog, trueLogType = LogType.ALWAYS, falseLogType = LogType.ALWAYS) {
|
|
@@ -172,11 +181,17 @@ export class Common {
|
|
|
172
181
|
}
|
|
173
182
|
}).bind(this);
|
|
174
183
|
}
|
|
175
|
-
bindOnUpdateNumericBoolean(charKey, valueKey, logTrue, logFalse, callback) {
|
|
184
|
+
bindOnUpdateNumericBoolean(charKey, valueKey, logTrue, logFalse, allowAutoReset = false, callback) {
|
|
176
185
|
return (async (_topic, value) => {
|
|
177
186
|
const numeric = value === this.getPrimitiveValue(valueKey) ? 1 : 0;
|
|
178
187
|
this.onUpdate(charKey, numeric, numeric ? logTrue : logFalse);
|
|
179
188
|
callback?.(numeric);
|
|
189
|
+
if (allowAutoReset && numeric === 1) {
|
|
190
|
+
this.startTimeout(() => {
|
|
191
|
+
this.onUpdate(charKey, 0, logFalse);
|
|
192
|
+
callback?.(0);
|
|
193
|
+
});
|
|
194
|
+
}
|
|
180
195
|
}).bind(this);
|
|
181
196
|
}
|
|
182
197
|
bindOnUpdateTemperature(config, charKey, logTemplate, callback) {
|
|
@@ -228,7 +243,7 @@ export class Common {
|
|
|
228
243
|
this.onSetNumeric(key, topic, value, logTemplate);
|
|
229
244
|
}).bind(this);
|
|
230
245
|
}
|
|
231
|
-
bindOnSetBoolean(key, setTopicKey, trueValueKey, falseValueKey, trueValue, trueLog, falseLog, callback) {
|
|
246
|
+
bindOnSetBoolean(key, setTopicKey, trueValueKey, falseValueKey, trueValue, trueLog, falseLog, allowAutoReset = false, callback) {
|
|
232
247
|
return (async (value) => {
|
|
233
248
|
if (!this.assert(setTopicKey, trueValueKey, falseValueKey)) {
|
|
234
249
|
return;
|
|
@@ -247,6 +262,12 @@ export class Common {
|
|
|
247
262
|
const publish = booleanValue ? this.getPrimitiveValue(trueValueKey) : this.getPrimitiveValue(falseValueKey);
|
|
248
263
|
this.onSet(key, value, publish, setTopicKey, logString);
|
|
249
264
|
callback?.(booleanValue);
|
|
265
|
+
if (allowAutoReset && booleanValue) {
|
|
266
|
+
this.startTimeout(() => {
|
|
267
|
+
this.onSet(key, typeof value === 'boolean' ? false : 0, this.getPrimitiveValue(falseValueKey), setTopicKey, falseLog);
|
|
268
|
+
callback?.(false);
|
|
269
|
+
});
|
|
270
|
+
}
|
|
250
271
|
}).bind(this);
|
|
251
272
|
}
|
|
252
273
|
bindOnSetState(key, setTopicKey, states, strings, badValueLog) {
|
|
@@ -305,6 +326,45 @@ export class Common {
|
|
|
305
326
|
}
|
|
306
327
|
return this.Characteristic[key];
|
|
307
328
|
}
|
|
329
|
+
startTimeout(callback) {
|
|
330
|
+
if (this.timeout !== undefined) {
|
|
331
|
+
this.logIfDesired(strings.autoReset.reset);
|
|
332
|
+
}
|
|
333
|
+
clearTimeout(this.timeout);
|
|
334
|
+
this.timeout = undefined;
|
|
335
|
+
if (!('autoReset' in this.config) || this.config.autoReset === undefined) {
|
|
336
|
+
return;
|
|
337
|
+
}
|
|
338
|
+
const config = this.config.autoReset;
|
|
339
|
+
if (!assert(this.log, this.name, config, 'time', 'units')) {
|
|
340
|
+
return;
|
|
341
|
+
}
|
|
342
|
+
let delay = config.time;
|
|
343
|
+
let string;
|
|
344
|
+
switch (config.units) {
|
|
345
|
+
case TimeUnits.MILLISECONDS:
|
|
346
|
+
delay = config.time;
|
|
347
|
+
string = strings.autoReset.startMilliseconds;
|
|
348
|
+
break;
|
|
349
|
+
case TimeUnits.SECONDS:
|
|
350
|
+
delay = config.time * SECOND;
|
|
351
|
+
string = strings.autoReset.startSeconds;
|
|
352
|
+
break;
|
|
353
|
+
case TimeUnits.MINUTES:
|
|
354
|
+
delay = config.time * MINUTE;
|
|
355
|
+
string = strings.autoReset.startMinutes;
|
|
356
|
+
break;
|
|
357
|
+
case TimeUnits.HOURS:
|
|
358
|
+
delay = config.time * HOUR;
|
|
359
|
+
string = strings.autoReset.startHours;
|
|
360
|
+
break;
|
|
361
|
+
}
|
|
362
|
+
this.timeout = setTimeout(() => {
|
|
363
|
+
this.timeout = undefined;
|
|
364
|
+
callback();
|
|
365
|
+
}, delay);
|
|
366
|
+
this.logIfDesired(string, config.time.toString());
|
|
367
|
+
}
|
|
308
368
|
logIfDesired(levelOrMessage, ...rest) {
|
|
309
369
|
if (this.disableLogging) {
|
|
310
370
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/accessory/abstract/common.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/accessory/abstract/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { HKCharacteristicKey } from '../../model/enums.js';
|
|
|
4
4
|
export class ActiveClimateAccessory extends TemperatureControlAccessory {
|
|
5
5
|
constructor(dependency) {
|
|
6
6
|
super(dependency);
|
|
7
|
-
this.setup(HKCharacteristicKey.Active, dependency.Characteristic.Active.INACTIVE, 'topicGetActive', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.Active, 'valueStateActive', strings.active.active, strings.active.notActive), true, 'topicSetActive', this.bindOnSetBoolean(HKCharacteristicKey.Active, 'topicSetActive', 'valueStateActive', 'valueStateInactive', dependency.Characteristic.Active.ACTIVE, strings.active.activeSet, strings.active.inactiveSet));
|
|
7
|
+
this.setup(HKCharacteristicKey.Active, dependency.Characteristic.Active.INACTIVE, 'topicGetActive', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.Active, 'valueStateActive', strings.active.active, strings.active.notActive, true), true, 'topicSetActive', this.bindOnSetBoolean(HKCharacteristicKey.Active, 'topicSetActive', 'valueStateActive', 'valueStateInactive', dependency.Characteristic.Active.ACTIVE, strings.active.activeSet, strings.active.inactiveSet, true));
|
|
8
8
|
this.setup(HKCharacteristicKey.LockPhysicalControls, dependency.Characteristic.LockPhysicalControls.CONTROL_LOCK_DISABLED, 'topicGetLockPhysicalControls', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.LockPhysicalControls, 'valueControlLock', strings.active.controlsLocked, strings.active.controlsUnLocked), false, 'topicSetLockPhysicalControls', this.bindOnSetBoolean(HKCharacteristicKey.LockPhysicalControls, 'topicSetLockPhysicalControls', 'valueControlLock', 'valueControlUnlock', dependency.Characteristic.LockPhysicalControls.CONTROL_LOCK_ENABLED, strings.active.controlsLockFuture, strings.active.controlsUnlockFuture));
|
|
9
9
|
let rotationLogString = strings.active.rotationValueUpdate;
|
|
10
10
|
if (!dependency.config.maximumRotationSpeed || !this.assertType('number', 'maximumRotationSpeed')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"active.js","sourceRoot":"","sources":["../../../src/accessory/climate/active.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAG3D,MAAM,OAAgB,sBAA4E,SAAQ,2BAA8B;IAEtI,YAAY,UAAsC;QAChD,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,MAAM,EAAE,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,EAC9E,gBAAgB,EAChB,IAAI,CAAC,0BAA0B,CAAC,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,IAAI,
|
|
1
|
+
{"version":3,"file":"active.js","sourceRoot":"","sources":["../../../src/accessory/climate/active.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,9 +8,9 @@ export class OnOffAccessory extends BaseAccessory {
|
|
|
8
8
|
lastConsumption;
|
|
9
9
|
constructor(dependency) {
|
|
10
10
|
super(dependency);
|
|
11
|
-
this.setup(HKCharacteristicKey.On, false, 'topicGetOn', this.bindOnUpdateBoolean(HKCharacteristicKey.On, 'valueOn', 'valueOff', strings.onOff.stateOn, strings.onOff.stateOff, (value) => {
|
|
11
|
+
this.setup(HKCharacteristicKey.On, false, 'topicGetOn', this.bindOnUpdateBoolean(HKCharacteristicKey.On, 'valueOn', 'valueOff', strings.onOff.stateOn, strings.onOff.stateOff, true, (value) => {
|
|
12
12
|
this.recordHistory(HistoryType.CUSTOM, { status: value ? 1 : 0 }, true);
|
|
13
|
-
}), true, 'topicSetOn', this.bindOnSetBoolean(HKCharacteristicKey.On, 'topicSetOn', 'valueOn', 'valueOff', true, strings.onOff.stateOnFuture, strings.onOff.stateOffFuture, (value) => {
|
|
13
|
+
}), true, 'topicSetOn', this.bindOnSetBoolean(HKCharacteristicKey.On, 'topicSetOn', 'valueOn', 'valueOff', true, strings.onOff.stateOnFuture, strings.onOff.stateOffFuture, true, (value) => {
|
|
14
14
|
this.recordHistory(HistoryType.CUSTOM, { status: value ? 1 : 0 }, true);
|
|
15
15
|
}));
|
|
16
16
|
this.setup(EveCharacteristicKey.ElectricCurrent, 0, 'topicGetElectricCurrent', this.bindOnUpdateNumeric(EveCharacteristicKey.ElectricCurrent, strings.outlet.electricCurrent), false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onoff.js","sourceRoot":"","sources":["../../../src/accessory/onoff/onoff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAExE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGrD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAI3C,MAAM,OAAgB,cAAoD,SAAQ,aAAgB;IAExF,eAAe,CAAmB;IAE1C,YAAY,UAAsC;QAChD,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE,EAAE,KAAK,EACtC,YAAY,EACZ,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"onoff.js","sourceRoot":"","sources":["../../../src/accessory/onoff/onoff.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ export class CO2SensorAccessory extends SensorAccessory {
|
|
|
7
7
|
}
|
|
8
8
|
constructor(dependency) {
|
|
9
9
|
super(dependency);
|
|
10
|
-
this.setup(HKCharacteristicKey.CarbonDioxideDetected, dependency.Characteristic.CarbonDioxideDetected.CO2_LEVELS_NORMAL, 'topicGetCarbonDioxideDetected', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.CarbonDioxideDetected, 'valueCarbonDioxideDetected', strings.sensor.carbonDioxide.active, strings.sensor.carbonDioxide.inactive), true);
|
|
10
|
+
this.setup(HKCharacteristicKey.CarbonDioxideDetected, dependency.Characteristic.CarbonDioxideDetected.CO2_LEVELS_NORMAL, 'topicGetCarbonDioxideDetected', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.CarbonDioxideDetected, 'valueCarbonDioxideDetected', strings.sensor.carbonDioxide.active, strings.sensor.carbonDioxide.inactive, true), true);
|
|
11
11
|
this.setup(HKCharacteristicKey.CarbonDioxideLevel, 0, 'topicGetCarbonDioxideLevel', this.bindOnUpdateNumeric(HKCharacteristicKey.CarbonDioxideLevel, strings.sensor.carbonDioxide.level), false);
|
|
12
12
|
this.setup(HKCharacteristicKey.CarbonDioxidePeakLevel, 0, 'topicGetCarbonDioxidePeakLevel', this.bindOnUpdateNumeric(HKCharacteristicKey.CarbonDioxidePeakLevel, strings.sensor.carbonDioxide.peakLevel), false);
|
|
13
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"carbonDioxide.js","sourceRoot":"","sources":["../../../src/accessory/sensor/carbonDioxide.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAG1E,MAAM,OAAO,kBAAmB,SAAQ,eAAgC;IAE5D,gBAAgB;QACxB,OAAO,aAAa,CAAC,mBAAmB,CAAC;IAC3C,CAAC;IAED,YAAY,UAAoD;QAC9D,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,qBAAqB,EAAE,UAAU,CAAC,cAAc,CAAC,qBAAqB,CAAC,iBAAiB,EACrH,+BAA+B,EAC/B,IAAI,CAAC,0BAA0B,CAC7B,mBAAmB,CAAC,qBAAqB,EACzC,4BAA4B,EAC5B,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"carbonDioxide.js","sourceRoot":"","sources":["../../../src/accessory/sensor/carbonDioxide.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAG1E,MAAM,OAAO,kBAAmB,SAAQ,eAAgC;IAE5D,gBAAgB;QACxB,OAAO,aAAa,CAAC,mBAAmB,CAAC;IAC3C,CAAC;IAED,YAAY,UAAoD;QAC9D,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,qBAAqB,EAAE,UAAU,CAAC,cAAc,CAAC,qBAAqB,CAAC,iBAAiB,EACrH,+BAA+B,EAC/B,IAAI,CAAC,0BAA0B,CAC7B,mBAAmB,CAAC,qBAAqB,EACzC,4BAA4B,EAC5B,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,EAC1E,IAAI,CAAC,EACP,IAAI,CAAC,CAAC;QAER,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,CAAC,EAClD,4BAA4B,EAAE,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;QAE7I,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,CAAC,EACtD,gCAAgC,EAAE,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;IAC3J,CAAC;CACF"}
|
|
@@ -7,7 +7,7 @@ export class COSensorAccessory extends SensorAccessory {
|
|
|
7
7
|
}
|
|
8
8
|
constructor(dependency) {
|
|
9
9
|
super(dependency);
|
|
10
|
-
this.setup(HKCharacteristicKey.CarbonMonoxideDetected, dependency.Characteristic.CarbonMonoxideDetected.CO_LEVELS_NORMAL, 'topicGetCarbonMonoxideDetected', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.CarbonMonoxideDetected, 'valueCarbonMonoxideDetected', strings.sensor.carbonMonoxide.active, strings.sensor.carbonMonoxide.inactive), true);
|
|
10
|
+
this.setup(HKCharacteristicKey.CarbonMonoxideDetected, dependency.Characteristic.CarbonMonoxideDetected.CO_LEVELS_NORMAL, 'topicGetCarbonMonoxideDetected', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.CarbonMonoxideDetected, 'valueCarbonMonoxideDetected', strings.sensor.carbonMonoxide.active, strings.sensor.carbonMonoxide.inactive, true), true);
|
|
11
11
|
this.setup(HKCharacteristicKey.CarbonMonoxideLevel, 0, 'topicGetCarbonMonoxideLevel', this.bindOnUpdateNumeric(HKCharacteristicKey.CarbonMonoxideLevel, strings.sensor.carbonMonoxide.level), false);
|
|
12
12
|
this.setup(HKCharacteristicKey.CarbonMonoxidePeakLevel, 0, 'topicGetCarbonMonoxidePeakLevel', this.bindOnUpdateNumeric(HKCharacteristicKey.CarbonMonoxidePeakLevel, strings.sensor.carbonMonoxide.peakLevel), false);
|
|
13
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"carbonMonoxide.js","sourceRoot":"","sources":["../../../src/accessory/sensor/carbonMonoxide.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAG1E,MAAM,OAAO,iBAAkB,SAAQ,eAA+B;IAE1D,gBAAgB;QACxB,OAAO,aAAa,CAAC,oBAAoB,CAAC;IAC5C,CAAC;IAED,YAAY,UAAmD;QAC7D,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,UAAU,CAAC,cAAc,CAAC,sBAAsB,CAAC,gBAAgB,EACtH,gCAAgC,EAChC,IAAI,CAAC,0BAA0B,CAC7B,mBAAmB,CAAC,sBAAsB,EAC1C,6BAA6B,EAC7B,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"carbonMonoxide.js","sourceRoot":"","sources":["../../../src/accessory/sensor/carbonMonoxide.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAG1E,MAAM,OAAO,iBAAkB,SAAQ,eAA+B;IAE1D,gBAAgB;QACxB,OAAO,aAAa,CAAC,oBAAoB,CAAC;IAC5C,CAAC;IAED,YAAY,UAAmD;QAC7D,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,UAAU,CAAC,cAAc,CAAC,sBAAsB,CAAC,gBAAgB,EACtH,gCAAgC,EAChC,IAAI,CAAC,0BAA0B,CAC7B,mBAAmB,CAAC,sBAAsB,EAC1C,6BAA6B,EAC7B,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,QAAQ,EAC5E,IAAI,CAAC,EACP,IAAI,CAAC,CAAC;QAER,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,mBAAmB,EAAE,CAAC,EACnD,6BAA6B,EAAE,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,mBAAmB,EAAE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;QAEhJ,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,uBAAuB,EAAE,CAAC,EACvD,iCAAiC,EAAE,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,uBAAuB,EAAE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC;IAC9J,CAAC;CACF"}
|
|
@@ -3,6 +3,8 @@ import { AccessoryType } from '../../model/enums.js';
|
|
|
3
3
|
import { ContactSensorConfig, MQTTAccessoryDependency } from '../../model/types.js';
|
|
4
4
|
export declare class ContactSensorAccessory extends SensorAccessory<ContactSensorConfig> {
|
|
5
5
|
protected getAccessoryType(): AccessoryType;
|
|
6
|
+
private readonly CONTACT_DETECTED;
|
|
7
|
+
private readonly CONTACT_NOT_DETECTED;
|
|
6
8
|
constructor(dependency: MQTTAccessoryDependency<ContactSensorConfig>);
|
|
7
|
-
private
|
|
9
|
+
private bindOnContactStateUpdate;
|
|
8
10
|
}
|
|
@@ -7,9 +7,18 @@ export class ContactSensorAccessory extends SensorAccessory {
|
|
|
7
7
|
getAccessoryType() {
|
|
8
8
|
return AccessoryType.ContactSensor;
|
|
9
9
|
}
|
|
10
|
+
CONTACT_DETECTED;
|
|
11
|
+
CONTACT_NOT_DETECTED;
|
|
10
12
|
constructor(dependency) {
|
|
11
13
|
super(dependency);
|
|
12
|
-
this.
|
|
14
|
+
this.CONTACT_DETECTED = dependency.Characteristic.ContactSensorState.CONTACT_DETECTED;
|
|
15
|
+
this.CONTACT_NOT_DETECTED = dependency.Characteristic.ContactSensorState.CONTACT_NOT_DETECTED;
|
|
16
|
+
this.setup(HKCharacteristicKey.ContactSensorState, this.CONTACT_NOT_DETECTED, 'topicGetContactSensorState', this.bindOnContactStateUpdate(strings.sensor.contact.active, strings.sensor.contact.inactive, (value) => {
|
|
17
|
+
this.recordHistory(HistoryType.DOOR, { status: value }, true);
|
|
18
|
+
if (value === this.CONTACT_NOT_DETECTED) {
|
|
19
|
+
this.updateNumericValue(EveCharacteristicKey.TimesOpened, 1);
|
|
20
|
+
}
|
|
21
|
+
}), true);
|
|
13
22
|
this.setupTopicless(EveCharacteristicKey.OpenDuration, 0);
|
|
14
23
|
this.setupTopicless(EveCharacteristicKey.ClosedDuration, 0);
|
|
15
24
|
this.setupTopicless(EveCharacteristicKey.TimesOpened, 0);
|
|
@@ -17,14 +26,18 @@ export class ContactSensorAccessory extends SensorAccessory {
|
|
|
17
26
|
this.onUpdate(EveCharacteristicKey.TimesOpened, 0, strings.sensor.contact.timesOpenedReset);
|
|
18
27
|
});
|
|
19
28
|
}
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
this.
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
29
|
+
bindOnContactStateUpdate(logDetected, logNotDetected, callback) {
|
|
30
|
+
return (async (_topic, value) => {
|
|
31
|
+
const numeric = value === this.getPrimitiveValue('valueContactDetected') ? this.CONTACT_DETECTED : this.CONTACT_NOT_DETECTED;
|
|
32
|
+
this.onUpdate(HKCharacteristicKey.ContactSensorState, numeric, numeric === this.CONTACT_DETECTED ? logDetected : logNotDetected);
|
|
33
|
+
callback?.(numeric);
|
|
34
|
+
if (numeric === this.CONTACT_DETECTED) {
|
|
35
|
+
this.startTimeout(() => {
|
|
36
|
+
this.onUpdate(HKCharacteristicKey.ContactSensorState, this.CONTACT_NOT_DETECTED, logNotDetected);
|
|
37
|
+
callback?.(this.CONTACT_NOT_DETECTED);
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
}).bind(this);
|
|
28
41
|
}
|
|
29
42
|
}
|
|
30
43
|
//# sourceMappingURL=contact.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contact.js","sourceRoot":"","sources":["../../../src/accessory/sensor/contact.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAChG,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"contact.js","sourceRoot":"","sources":["../../../src/accessory/sensor/contact.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ export class LeakSensorAccessory extends SensorAccessory {
|
|
|
7
7
|
}
|
|
8
8
|
constructor(dependency) {
|
|
9
9
|
super(dependency);
|
|
10
|
-
this.setup(HKCharacteristicKey.LeakDetected, dependency.Characteristic.LeakDetected.LEAK_NOT_DETECTED, 'topicGetLeakDetected', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.LeakDetected, 'valueLeakDetected', strings.sensor.leak.active, strings.sensor.leak.inactive), true);
|
|
10
|
+
this.setup(HKCharacteristicKey.LeakDetected, dependency.Characteristic.LeakDetected.LEAK_NOT_DETECTED, 'topicGetLeakDetected', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.LeakDetected, 'valueLeakDetected', strings.sensor.leak.active, strings.sensor.leak.inactive, true), true);
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
13
|
//# sourceMappingURL=leak.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"leak.js","sourceRoot":"","sources":["../../../src/accessory/sensor/leak.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAG1E,MAAM,OAAO,mBAAoB,SAAQ,eAAiC;IAE9D,gBAAgB;QACxB,OAAO,aAAa,CAAC,UAAU,CAAC;IAClC,CAAC;IAED,YAAY,UAAqD;QAC/D,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,YAAY,EAAE,UAAU,CAAC,cAAc,CAAC,YAAY,CAAC,iBAAiB,EACnG,sBAAsB,EACtB,IAAI,CAAC,0BAA0B,CAAC,mBAAmB,CAAC,YAAY,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"leak.js","sourceRoot":"","sources":["../../../src/accessory/sensor/leak.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAG1E,MAAM,OAAO,mBAAoB,SAAQ,eAAiC;IAE9D,gBAAgB;QACxB,OAAO,aAAa,CAAC,UAAU,CAAC;IAClC,CAAC;IAED,YAAY,UAAqD;QAC/D,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,YAAY,EAAE,UAAU,CAAC,cAAc,CAAC,YAAY,CAAC,iBAAiB,EACnG,sBAAsB,EACtB,IAAI,CAAC,0BAA0B,CAAC,mBAAmB,CAAC,YAAY,EAAE,mBAAmB,EACnF,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,EACjE,IAAI,CAAC,CAAC;IACV,CAAC;CACF"}
|
|
@@ -8,7 +8,7 @@ export class MotionSensorAccessory extends SensorAccessory {
|
|
|
8
8
|
}
|
|
9
9
|
constructor(dependency) {
|
|
10
10
|
super(dependency);
|
|
11
|
-
this.setup(HKCharacteristicKey.MotionDetected, false, 'topicGetMotionDetected', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.MotionDetected, 'valueMotionDetected', strings.sensor.motion.active, strings.sensor.motion.inactive, (value) => {
|
|
11
|
+
this.setup(HKCharacteristicKey.MotionDetected, false, 'topicGetMotionDetected', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.MotionDetected, 'valueMotionDetected', strings.sensor.motion.active, strings.sensor.motion.inactive, true, (value) => {
|
|
12
12
|
this.recordHistory(HistoryType.MOTION, { status: value }, true);
|
|
13
13
|
}), true);
|
|
14
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"motion.js","sourceRoot":"","sources":["../../../src/accessory/sensor/motion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGrD,MAAM,OAAO,qBAAsB,SAAQ,eAAmC;IAElE,gBAAgB;QACxB,OAAO,aAAa,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,YACE,UAAuD;QACvD,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,cAAc,EAAE,KAAK,EAClD,wBAAwB,EACxB,IAAI,CAAC,0BAA0B,CAAC,mBAAmB,CAAC,cAAc,EAAE,qBAAqB,
|
|
1
|
+
{"version":3,"file":"motion.js","sourceRoot":"","sources":["../../../src/accessory/sensor/motion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGrD,MAAM,OAAO,qBAAsB,SAAQ,eAAmC;IAElE,gBAAgB;QACxB,OAAO,aAAa,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,YACE,UAAuD;QACvD,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,cAAc,EAAE,KAAK,EAClD,wBAAwB,EACxB,IAAI,CAAC,0BAA0B,CAAC,mBAAmB,CAAC,cAAc,EAAE,qBAAqB,EACvF,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAClE,CAAC,KAAK,EAAE,EAAE;YACR,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,IAAI,CAAC,CAAC;QAClE,CAAC,CACF,EACD,IAAI,CAAC,CAAC;IACV,CAAC;CACF"}
|
|
@@ -7,7 +7,7 @@ export class OccupancySensorAccessory extends SensorAccessory {
|
|
|
7
7
|
}
|
|
8
8
|
constructor(dependency) {
|
|
9
9
|
super(dependency);
|
|
10
|
-
this.setup(HKCharacteristicKey.OccupancyDetected, dependency.Characteristic.OccupancyDetected.OCCUPANCY_NOT_DETECTED, 'topicGetOccupancyDetected', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.OccupancyDetected, 'valueOccupancyDetected', strings.sensor.occupancy.active, strings.sensor.occupancy.inactive), true);
|
|
10
|
+
this.setup(HKCharacteristicKey.OccupancyDetected, dependency.Characteristic.OccupancyDetected.OCCUPANCY_NOT_DETECTED, 'topicGetOccupancyDetected', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.OccupancyDetected, 'valueOccupancyDetected', strings.sensor.occupancy.active, strings.sensor.occupancy.inactive, true), true);
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
13
|
//# sourceMappingURL=occupancy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"occupancy.js","sourceRoot":"","sources":["../../../src/accessory/sensor/occupancy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAG1E,MAAM,OAAO,wBAAyB,SAAQ,eAAsC;IAExE,gBAAgB;QACxB,OAAO,aAAa,CAAC,eAAe,CAAC;IACvC,CAAC;IAED,YACE,UAA0D;QAC1D,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,iBAAiB,EAAE,UAAU,CAAC,cAAc,CAAC,iBAAiB,CAAC,sBAAsB,EAClH,2BAA2B,EAC3B,IAAI,CAAC,0BAA0B,CAC7B,mBAAmB,CAAC,iBAAiB,EACrC,wBAAwB,EACxB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"occupancy.js","sourceRoot":"","sources":["../../../src/accessory/sensor/occupancy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAG1E,MAAM,OAAO,wBAAyB,SAAQ,eAAsC;IAExE,gBAAgB;QACxB,OAAO,aAAa,CAAC,eAAe,CAAC;IACvC,CAAC;IAED,YACE,UAA0D;QAC1D,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,iBAAiB,EAAE,UAAU,CAAC,cAAc,CAAC,iBAAiB,CAAC,sBAAsB,EAClH,2BAA2B,EAC3B,IAAI,CAAC,0BAA0B,CAC7B,mBAAmB,CAAC,iBAAiB,EACrC,wBAAwB,EACxB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAClE,IAAI,CAAC,EACP,IAAI,CAAC,CAAC;IACV,CAAC;CACF"}
|
|
@@ -7,7 +7,7 @@ export class SmokeSensorAccessory extends SensorAccessory {
|
|
|
7
7
|
}
|
|
8
8
|
constructor(dependency) {
|
|
9
9
|
super(dependency);
|
|
10
|
-
this.setup(HKCharacteristicKey.SmokeDetected, dependency.Characteristic.SmokeDetected.SMOKE_NOT_DETECTED, 'topicGetSmokeDetected', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.SmokeDetected, 'valueSmokeDetected', strings.sensor.smoke.active, strings.sensor.smoke.inactive), true);
|
|
10
|
+
this.setup(HKCharacteristicKey.SmokeDetected, dependency.Characteristic.SmokeDetected.SMOKE_NOT_DETECTED, 'topicGetSmokeDetected', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.SmokeDetected, 'valueSmokeDetected', strings.sensor.smoke.active, strings.sensor.smoke.inactive, true), true);
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
13
|
//# sourceMappingURL=smoke.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smoke.js","sourceRoot":"","sources":["../../../src/accessory/sensor/smoke.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAG1E,MAAM,OAAO,oBAAqB,SAAQ,eAAkC;IAEhE,gBAAgB;QACxB,OAAO,aAAa,CAAC,WAAW,CAAC;IACnC,CAAC;IAED,YAAY,UAAsD;QAChE,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,aAAa,EAAE,UAAU,CAAC,cAAc,CAAC,aAAa,CAAC,kBAAkB,EACtG,uBAAuB,EACvB,IAAI,CAAC,0BAA0B,CAAC,mBAAmB,CAAC,aAAa,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"smoke.js","sourceRoot":"","sources":["../../../src/accessory/sensor/smoke.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAG1E,MAAM,OAAO,oBAAqB,SAAQ,eAAkC;IAEhE,gBAAgB;QACxB,OAAO,aAAa,CAAC,WAAW,CAAC;IACnC,CAAC;IAED,YAAY,UAAsD;QAChE,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,aAAa,EAAE,UAAU,CAAC,cAAc,CAAC,aAAa,CAAC,kBAAkB,EACtG,uBAAuB,EACvB,IAAI,CAAC,0BAA0B,CAAC,mBAAmB,CAAC,aAAa,EAAE,oBAAoB,EACrF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,EACnE,IAAI,CAAC,CAAC;IACV,CAAC;CACF"}
|