homebridge-easy-mqtt 1.4.1-beta.0 → 1.4.1-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 +2 -1
- package/README.md +18 -1
- package/config.schema.json +140 -6
- package/dist/accessory/abstract/base.d.ts +2 -4
- package/dist/accessory/abstract/base.js +16 -16
- package/dist/accessory/abstract/base.js.map +1 -1
- package/dist/accessory/abstract/common.d.ts +4 -1
- package/dist/accessory/abstract/common.js +49 -1
- package/dist/accessory/abstract/common.js.map +1 -1
- package/dist/accessory/abstract/group.d.ts +2 -4
- package/dist/accessory/abstract/group.js +11 -11
- package/dist/accessory/abstract/group.js.map +1 -1
- package/dist/accessory/abstract/helper.d.ts +3 -5
- package/dist/accessory/abstract/helper.js +34 -30
- package/dist/accessory/abstract/helper.js.map +1 -1
- package/dist/accessory/abstract/mqtt.d.ts +9 -8
- package/dist/accessory/abstract/mqtt.js +31 -24
- package/dist/accessory/abstract/mqtt.js.map +1 -1
- package/dist/accessory/addons/filter.js +7 -7
- package/dist/accessory/addons/filter.js.map +1 -1
- package/dist/accessory/button/button.d.ts +6 -0
- package/dist/accessory/{button.js → button/button.js} +6 -10
- package/dist/accessory/button/button.js.map +1 -0
- package/dist/accessory/button/doorbell.d.ts +7 -0
- package/dist/accessory/button/doorbell.js +25 -0
- package/dist/accessory/button/doorbell.js.map +1 -0
- package/dist/accessory/button/stateless.d.ts +6 -0
- package/dist/accessory/button/stateless.js +8 -0
- package/dist/accessory/button/stateless.js.map +1 -0
- package/dist/accessory/{abstract/customCharacteristic.js → characteristic/custom.js} +1 -1
- package/dist/accessory/characteristic/custom.js.map +1 -0
- package/dist/accessory/climate/active.d.ts +2 -4
- package/dist/accessory/climate/active.js +13 -13
- package/dist/accessory/climate/active.js.map +1 -1
- package/dist/accessory/climate/fan2.d.ts +2 -4
- package/dist/accessory/climate/fan2.js +17 -17
- package/dist/accessory/climate/fan2.js.map +1 -1
- package/dist/accessory/climate/heaterCooler.d.ts +2 -4
- package/dist/accessory/climate/heaterCooler.js +16 -16
- package/dist/accessory/climate/heaterCooler.js.map +1 -1
- package/dist/accessory/climate/purifier.d.ts +2 -4
- package/dist/accessory/climate/purifier.js +14 -14
- package/dist/accessory/climate/purifier.js.map +1 -1
- package/dist/accessory/climate/temperatureControl.d.ts +3 -4
- package/dist/accessory/climate/temperatureControl.js +7 -7
- package/dist/accessory/climate/temperatureControl.js.map +1 -1
- package/dist/accessory/climate/thermostat.d.ts +2 -4
- package/dist/accessory/climate/thermostat.js +15 -15
- package/dist/accessory/climate/thermostat.js.map +1 -1
- package/dist/accessory/garage.d.ts +2 -4
- package/dist/accessory/garage.js +15 -15
- package/dist/accessory/garage.js.map +1 -1
- package/dist/accessory/lock.d.ts +2 -4
- package/dist/accessory/lock.js +10 -10
- package/dist/accessory/lock.js.map +1 -1
- package/dist/accessory/onoff/lightbulb.d.ts +2 -4
- package/dist/accessory/onoff/lightbulb.js +11 -11
- package/dist/accessory/onoff/lightbulb.js.map +1 -1
- package/dist/accessory/onoff/onoff.d.ts +2 -4
- package/dist/accessory/onoff/onoff.js +6 -6
- package/dist/accessory/onoff/onoff.js.map +1 -1
- package/dist/accessory/onoff/outlet.d.ts +2 -4
- package/dist/accessory/onoff/outlet.js +4 -4
- package/dist/accessory/onoff/outlet.js.map +1 -1
- package/dist/accessory/onoff/switch.d.ts +2 -4
- package/dist/accessory/onoff/switch.js +2 -2
- package/dist/accessory/onoff/switch.js.map +1 -1
- package/dist/accessory/position/blind.d.ts +2 -4
- package/dist/accessory/position/blind.js +7 -7
- package/dist/accessory/position/blind.js.map +1 -1
- package/dist/accessory/position/position.d.ts +2 -4
- package/dist/accessory/position/position.js +17 -17
- package/dist/accessory/position/position.js.map +1 -1
- package/dist/accessory/security.d.ts +2 -4
- package/dist/accessory/security.js +16 -16
- package/dist/accessory/security.js.map +1 -1
- package/dist/accessory/sensor/air.d.ts +2 -4
- package/dist/accessory/sensor/air.js +23 -23
- package/dist/accessory/sensor/air.js.map +1 -1
- package/dist/accessory/sensor/carbonDioxide.d.ts +2 -4
- package/dist/accessory/sensor/carbonDioxide.js +6 -6
- package/dist/accessory/sensor/carbonDioxide.js.map +1 -1
- package/dist/accessory/sensor/carbonMonoxide.d.ts +2 -4
- package/dist/accessory/sensor/carbonMonoxide.js +6 -6
- package/dist/accessory/sensor/carbonMonoxide.js.map +1 -1
- package/dist/accessory/sensor/contact.d.ts +2 -4
- package/dist/accessory/sensor/contact.js +5 -5
- package/dist/accessory/sensor/contact.js.map +1 -1
- package/dist/accessory/sensor/humidity.d.ts +2 -4
- package/dist/accessory/sensor/humidity.js +4 -4
- package/dist/accessory/sensor/humidity.js.map +1 -1
- package/dist/accessory/sensor/leak.d.ts +2 -4
- package/dist/accessory/sensor/leak.js +4 -4
- package/dist/accessory/sensor/leak.js.map +1 -1
- package/dist/accessory/sensor/light.d.ts +2 -4
- package/dist/accessory/sensor/light.js +4 -4
- package/dist/accessory/sensor/light.js.map +1 -1
- package/dist/accessory/sensor/motion.d.ts +2 -4
- package/dist/accessory/sensor/motion.js +4 -4
- package/dist/accessory/sensor/motion.js.map +1 -1
- package/dist/accessory/sensor/occupancy.d.ts +2 -4
- package/dist/accessory/sensor/occupancy.js +4 -4
- package/dist/accessory/sensor/occupancy.js.map +1 -1
- package/dist/accessory/sensor/sensor.d.ts +2 -4
- package/dist/accessory/sensor/sensor.js +7 -7
- package/dist/accessory/sensor/sensor.js.map +1 -1
- package/dist/accessory/sensor/smoke.d.ts +2 -4
- package/dist/accessory/sensor/smoke.js +4 -4
- package/dist/accessory/sensor/smoke.js.map +1 -1
- package/dist/accessory/sensor/temperature.d.ts +2 -4
- package/dist/accessory/sensor/temperature.js +4 -4
- package/dist/accessory/sensor/temperature.js.map +1 -1
- package/dist/accessory/valve.d.ts +2 -4
- package/dist/accessory/valve.js +14 -14
- package/dist/accessory/valve.js.map +1 -1
- package/dist/homebridge/platform.js +4 -2
- package/dist/homebridge/platform.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/en.d.ts +22 -0
- package/dist/i18n/en.js +23 -1
- package/dist/i18n/en.js.map +1 -1
- package/dist/i18n/fr.d.ts +22 -0
- package/dist/i18n/i18n.d.ts +22 -0
- package/dist/i18n/it.d.ts +22 -0
- package/dist/i18n/ro.d.ts +22 -0
- package/dist/i18n/template.d.ts +22 -0
- package/dist/i18n/vi.d.ts +22 -0
- package/dist/model/enums.d.ts +6 -2
- package/dist/model/enums.js +80 -77
- package/dist/model/enums.js.map +1 -1
- package/dist/model/types.d.ts +24 -1
- package/dist/tools/log.d.ts +1 -1
- package/dist/tools/log.js.map +1 -1
- package/dist/tools/properties.js +1 -1
- package/dist/tools/properties.js.map +1 -1
- package/package.json +1 -1
- package/dist/accessory/abstract/customCharacteristic.js.map +0 -1
- package/dist/accessory/button.d.ts +0 -10
- package/dist/accessory/button.js.map +0 -1
- /package/dist/accessory/{abstract/customCharacteristic.d.ts → characteristic/custom.d.ts} +0 -0
|
@@ -1,35 +1,35 @@
|
|
|
1
1
|
import { ActiveClimateAccessory } from './active.js';
|
|
2
2
|
import { strings } from '../../i18n/i18n.js';
|
|
3
|
-
import { AccessoryType,
|
|
3
|
+
import { AccessoryType, HKCharacteristicKey } from '../../model/enums.js';
|
|
4
4
|
export class FanV2Accessory extends ActiveClimateAccessory {
|
|
5
5
|
CURRENT_STATE_MAP;
|
|
6
6
|
TARGET_STATE_MAP;
|
|
7
|
-
constructor(
|
|
8
|
-
super(
|
|
7
|
+
constructor(dependency) {
|
|
8
|
+
super(dependency);
|
|
9
9
|
this.CURRENT_STATE_MAP = new Map([
|
|
10
|
-
['valueModeInactive', Characteristic.CurrentFanState.INACTIVE],
|
|
11
|
-
['valueModeIdle', Characteristic.CurrentFanState.IDLE],
|
|
12
|
-
['valueModeBlowing', Characteristic.CurrentFanState.BLOWING_AIR],
|
|
10
|
+
['valueModeInactive', dependency.Characteristic.CurrentFanState.INACTIVE],
|
|
11
|
+
['valueModeIdle', dependency.Characteristic.CurrentFanState.IDLE],
|
|
12
|
+
['valueModeBlowing', dependency.Characteristic.CurrentFanState.BLOWING_AIR],
|
|
13
13
|
]);
|
|
14
14
|
this.TARGET_STATE_MAP = new Map([
|
|
15
|
-
['valueModeManual', Characteristic.TargetFanState.MANUAL],
|
|
16
|
-
['valueModeAuto', Characteristic.TargetFanState.AUTO],
|
|
15
|
+
['valueModeManual', dependency.Characteristic.TargetFanState.MANUAL],
|
|
16
|
+
['valueModeAuto', dependency.Characteristic.TargetFanState.AUTO],
|
|
17
17
|
]);
|
|
18
18
|
const validCurrentStates = Array.from(this.CURRENT_STATE_MAP.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
|
|
19
|
-
if (config.topicGetCurrentFanState !== undefined && validCurrentStates.length === 0) {
|
|
19
|
+
if (dependency.config.topicGetCurrentFanState !== undefined && validCurrentStates.length === 0) {
|
|
20
20
|
this.log.error(strings.fanv2.noCurrentStateValues, this.name);
|
|
21
21
|
return;
|
|
22
22
|
}
|
|
23
|
-
this.setup(
|
|
23
|
+
this.setup(HKCharacteristicKey.CurrentFanState, this.CURRENT_STATE_MAP.get(validCurrentStates[0]), 'topicGetCurrentFanState', this.onCurrentStateUpdate.bind(this), false)
|
|
24
24
|
?.setProps({ validValues: validCurrentStates.map((key) => this.CURRENT_STATE_MAP.get(key)) });
|
|
25
25
|
const validTargetStates = Array.from(this.TARGET_STATE_MAP.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
|
|
26
|
-
if (config.topicGetTargetFanState !== undefined && validTargetStates.length === 0) {
|
|
26
|
+
if (dependency.config.topicGetTargetFanState !== undefined && validTargetStates.length === 0) {
|
|
27
27
|
this.log.error(strings.fanv2.noTargetStateValues, this.name);
|
|
28
28
|
return;
|
|
29
29
|
}
|
|
30
|
-
this.setup(
|
|
30
|
+
this.setup(HKCharacteristicKey.TargetFanState, this.TARGET_STATE_MAP.get(validTargetStates[0]), 'topicGetTargetFanState', this.onTargetStateUpdate.bind(this), false, 'topicSetTargetFanState', this.onSetTargetState.bind(this))
|
|
31
31
|
?.setProps({ validValues: validTargetStates.map((key) => this.TARGET_STATE_MAP.get(key)) });
|
|
32
|
-
this.setup(
|
|
32
|
+
this.setup(HKCharacteristicKey.RotationDirection, dependency.Characteristic.RotationDirection.CLOCKWISE, 'topicGetRotationDirection', this.bindOnUpdateNumericBoolean(HKCharacteristicKey.RotationDirection, 'valueDirectionCounterClockwise', strings.fanv2.clockwise, strings.fanv2.counterClockwise), false, 'topicSetRotationDirection', this.onSetDirection.bind(this));
|
|
33
33
|
}
|
|
34
34
|
getAccessoryType() {
|
|
35
35
|
return AccessoryType.Fanv2;
|
|
@@ -39,21 +39,21 @@ export class FanV2Accessory extends ActiveClimateAccessory {
|
|
|
39
39
|
if (state === undefined) {
|
|
40
40
|
return;
|
|
41
41
|
}
|
|
42
|
-
this.onUpdate(
|
|
42
|
+
this.onUpdate(HKCharacteristicKey.CurrentFanState, state, this.stateStringForCurrentCV(state));
|
|
43
43
|
}
|
|
44
44
|
async onTargetStateUpdate(_topic, value) {
|
|
45
45
|
const state = this.toTargetCVState(value);
|
|
46
46
|
if (state === undefined) {
|
|
47
47
|
return;
|
|
48
48
|
}
|
|
49
|
-
this.onUpdate(
|
|
49
|
+
this.onUpdate(HKCharacteristicKey.TargetFanState, state, this.stateStringForTargetCV(state));
|
|
50
50
|
}
|
|
51
51
|
async onSetTargetState(value) {
|
|
52
52
|
const target = this.fromCVState(value);
|
|
53
53
|
if (target === undefined) {
|
|
54
54
|
return;
|
|
55
55
|
}
|
|
56
|
-
this.onSet(
|
|
56
|
+
this.onSet(HKCharacteristicKey.TargetFanState, value, target, 'topicSetTargetFanState', this.stateStringForTargetCV(value));
|
|
57
57
|
}
|
|
58
58
|
async onSetDirection(value) {
|
|
59
59
|
if (!this.assert('valueDirectionClockwise', 'valueDirectionCounterClockwise')) {
|
|
@@ -62,7 +62,7 @@ export class FanV2Accessory extends ActiveClimateAccessory {
|
|
|
62
62
|
const clockwise = value === this.Characteristic.RotationDirection.CLOCKWISE;
|
|
63
63
|
const logString = clockwise ? strings.fanv2.setDirectionClockwise : strings.fanv2.setDirectionCounterClockwise;
|
|
64
64
|
const publish = clockwise ? this.config.valueDirectionClockwise : this.config.valueDirectionCounterClockwise;
|
|
65
|
-
this.onSet(
|
|
65
|
+
this.onSet(HKCharacteristicKey.RotationDirection, value, publish, 'topicSetRotationDirection', logString);
|
|
66
66
|
}
|
|
67
67
|
fromCVState(value) {
|
|
68
68
|
let primative = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fan2.js","sourceRoot":"","sources":["../../../src/accessory/climate/fan2.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"fan2.js","sourceRoot":"","sources":["../../../src/accessory/climate/fan2.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
import { PlatformAccessory } from 'homebridge';
|
|
2
1
|
import { ActiveClimateAccessory } from './active.js';
|
|
3
2
|
import { AccessoryType } from '../../model/enums.js';
|
|
4
|
-
import {
|
|
5
|
-
import { Log } from '../../tools/log.js';
|
|
3
|
+
import { HeaterCoolerConfig, MQTTAccessoryDependency } from '../../model/types.js';
|
|
6
4
|
export declare class HeaterCoolerAccessory extends ActiveClimateAccessory<HeaterCoolerConfig> {
|
|
7
5
|
private readonly CURRENT_STATE_MAP;
|
|
8
6
|
private readonly TARGET_STATE_MAP;
|
|
9
|
-
constructor(
|
|
7
|
+
constructor(dependency: MQTTAccessoryDependency<HeaterCoolerConfig>);
|
|
10
8
|
protected getAccessoryType(): AccessoryType;
|
|
11
9
|
private onCurrentStateUpdate;
|
|
12
10
|
private onTargetStateUpdate;
|
|
@@ -1,39 +1,39 @@
|
|
|
1
1
|
import { ActiveClimateAccessory } from './active.js';
|
|
2
2
|
import { FilterMaintenance } from '../addons/filter.js';
|
|
3
3
|
import { strings } from '../../i18n/i18n.js';
|
|
4
|
-
import { AccessoryType,
|
|
4
|
+
import { AccessoryType, HKCharacteristicKey } from '../../model/enums.js';
|
|
5
5
|
export class HeaterCoolerAccessory extends ActiveClimateAccessory {
|
|
6
6
|
CURRENT_STATE_MAP;
|
|
7
7
|
TARGET_STATE_MAP;
|
|
8
|
-
constructor(
|
|
9
|
-
super(
|
|
8
|
+
constructor(dependency) {
|
|
9
|
+
super(dependency);
|
|
10
10
|
this.setupTemperatureControlCharacteristics();
|
|
11
11
|
this.CURRENT_STATE_MAP = new Map([
|
|
12
|
-
['valueModeInactive', Characteristic.CurrentHeaterCoolerState.INACTIVE],
|
|
13
|
-
['valueModeIdle', Characteristic.CurrentHeaterCoolerState.IDLE],
|
|
14
|
-
['valueModeHeat', Characteristic.CurrentHeaterCoolerState.HEATING],
|
|
15
|
-
['valueModeCool', Characteristic.CurrentHeaterCoolerState.COOLING],
|
|
12
|
+
['valueModeInactive', dependency.Characteristic.CurrentHeaterCoolerState.INACTIVE],
|
|
13
|
+
['valueModeIdle', dependency.Characteristic.CurrentHeaterCoolerState.IDLE],
|
|
14
|
+
['valueModeHeat', dependency.Characteristic.CurrentHeaterCoolerState.HEATING],
|
|
15
|
+
['valueModeCool', dependency.Characteristic.CurrentHeaterCoolerState.COOLING],
|
|
16
16
|
]);
|
|
17
17
|
this.TARGET_STATE_MAP = new Map([
|
|
18
|
-
['valueModeAuto', Characteristic.TargetHeaterCoolerState.AUTO],
|
|
19
|
-
['valueModeHeat', Characteristic.TargetHeaterCoolerState.HEAT],
|
|
20
|
-
['valueModeCool', Characteristic.TargetHeaterCoolerState.COOL],
|
|
18
|
+
['valueModeAuto', dependency.Characteristic.TargetHeaterCoolerState.AUTO],
|
|
19
|
+
['valueModeHeat', dependency.Characteristic.TargetHeaterCoolerState.HEAT],
|
|
20
|
+
['valueModeCool', dependency.Characteristic.TargetHeaterCoolerState.COOL],
|
|
21
21
|
]);
|
|
22
22
|
const validCurrentStates = Array.from(this.CURRENT_STATE_MAP.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
|
|
23
23
|
if (validCurrentStates.length === 0) {
|
|
24
24
|
this.log.error(strings.heaterCooler.noStateValues, this.name);
|
|
25
25
|
return;
|
|
26
26
|
}
|
|
27
|
-
this.setup(
|
|
27
|
+
this.setup(HKCharacteristicKey.CurrentHeaterCoolerState, this.CURRENT_STATE_MAP.get(validCurrentStates[0]), 'topicGetCurrentHeaterCoolerState', this.onCurrentStateUpdate.bind(this), true)
|
|
28
28
|
?.setProps({ validValues: validCurrentStates.map((key) => this.CURRENT_STATE_MAP.get(key)) });
|
|
29
29
|
const validTargetStates = Array.from(this.TARGET_STATE_MAP.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
|
|
30
30
|
if (validTargetStates.length === 0) {
|
|
31
31
|
this.log.error(strings.heaterCooler.noStateValues, this.name);
|
|
32
32
|
return;
|
|
33
33
|
}
|
|
34
|
-
this.setup(
|
|
34
|
+
this.setup(HKCharacteristicKey.TargetHeaterCoolerState, this.TARGET_STATE_MAP.get(validTargetStates[0]), 'topicGetTargetHeaterCoolerState', this.onTargetStateUpdate.bind(this), true, 'topicSetTargetHeaterCoolerState', this.onSetTargetState.bind(this))
|
|
35
35
|
?.setProps({ validValues: validTargetStates.map((key) => this.TARGET_STATE_MAP.get(key)) });
|
|
36
|
-
this.addTopicHandlers(FilterMaintenance.topicHandlers(Service, this, config));
|
|
36
|
+
this.addTopicHandlers(FilterMaintenance.topicHandlers(dependency.Service, this, dependency.config));
|
|
37
37
|
}
|
|
38
38
|
getAccessoryType() {
|
|
39
39
|
return AccessoryType.HeaterCooler;
|
|
@@ -43,21 +43,21 @@ export class HeaterCoolerAccessory extends ActiveClimateAccessory {
|
|
|
43
43
|
if (state === undefined) {
|
|
44
44
|
return;
|
|
45
45
|
}
|
|
46
|
-
this.onUpdate(
|
|
46
|
+
this.onUpdate(HKCharacteristicKey.CurrentHeaterCoolerState, state, this.stateStringForCurrentCV(state));
|
|
47
47
|
}
|
|
48
48
|
async onTargetStateUpdate(_topic, value) {
|
|
49
49
|
const state = this.toTargetCVState(value);
|
|
50
50
|
if (state === undefined) {
|
|
51
51
|
return;
|
|
52
52
|
}
|
|
53
|
-
this.onUpdate(
|
|
53
|
+
this.onUpdate(HKCharacteristicKey.TargetHeaterCoolerState, state, this.stateStringForTargetCV(state));
|
|
54
54
|
}
|
|
55
55
|
async onSetTargetState(value) {
|
|
56
56
|
const target = this.fromCVState(value);
|
|
57
57
|
if (target === undefined) {
|
|
58
58
|
return;
|
|
59
59
|
}
|
|
60
|
-
this.onSet(
|
|
60
|
+
this.onSet(HKCharacteristicKey.TargetHeaterCoolerState, value, target, 'topicSetTargetHeaterCoolerState', this.stateStringForTargetCV(value));
|
|
61
61
|
}
|
|
62
62
|
fromCVState(value) {
|
|
63
63
|
let primative = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"heaterCooler.js","sourceRoot":"","sources":["../../../src/accessory/climate/heaterCooler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"heaterCooler.js","sourceRoot":"","sources":["../../../src/accessory/climate/heaterCooler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
import { PlatformAccessory } from 'homebridge';
|
|
2
1
|
import { ActiveClimateAccessory } from './active.js';
|
|
3
2
|
import { AccessoryType } from '../../model/enums.js';
|
|
4
|
-
import {
|
|
5
|
-
import { Log } from '../../tools/log.js';
|
|
3
|
+
import { MQTTAccessoryDependency, PurifierConfig } from '../../model/types.js';
|
|
6
4
|
export declare class PurifierAccessory extends ActiveClimateAccessory<PurifierConfig> {
|
|
7
5
|
private readonly CURRENT_STATE_MAP;
|
|
8
6
|
private readonly TARGET_STATE_MAP;
|
|
9
|
-
constructor(
|
|
7
|
+
constructor(dependency: MQTTAccessoryDependency<PurifierConfig>);
|
|
10
8
|
protected getAccessoryType(): AccessoryType;
|
|
11
9
|
private onCurrentStateUpdate;
|
|
12
10
|
private onTargetStateUpdate;
|
|
@@ -1,36 +1,36 @@
|
|
|
1
1
|
import { ActiveClimateAccessory } from './active.js';
|
|
2
2
|
import { FilterMaintenance } from '../addons/filter.js';
|
|
3
3
|
import { strings } from '../../i18n/i18n.js';
|
|
4
|
-
import { AccessoryType,
|
|
4
|
+
import { AccessoryType, HKCharacteristicKey } from '../../model/enums.js';
|
|
5
5
|
export class PurifierAccessory extends ActiveClimateAccessory {
|
|
6
6
|
CURRENT_STATE_MAP;
|
|
7
7
|
TARGET_STATE_MAP;
|
|
8
|
-
constructor(
|
|
9
|
-
super(
|
|
8
|
+
constructor(dependency) {
|
|
9
|
+
super(dependency);
|
|
10
10
|
this.CURRENT_STATE_MAP = new Map([
|
|
11
|
-
['valueModeInactive', Characteristic.CurrentAirPurifierState.INACTIVE],
|
|
12
|
-
['valueModeIdle', Characteristic.CurrentAirPurifierState.IDLE],
|
|
13
|
-
['valueModePurifying', Characteristic.CurrentAirPurifierState.PURIFYING_AIR],
|
|
11
|
+
['valueModeInactive', dependency.Characteristic.CurrentAirPurifierState.INACTIVE],
|
|
12
|
+
['valueModeIdle', dependency.Characteristic.CurrentAirPurifierState.IDLE],
|
|
13
|
+
['valueModePurifying', dependency.Characteristic.CurrentAirPurifierState.PURIFYING_AIR],
|
|
14
14
|
]);
|
|
15
15
|
this.TARGET_STATE_MAP = new Map([
|
|
16
|
-
['valueModeManual', Characteristic.TargetAirPurifierState.MANUAL],
|
|
17
|
-
['valueModeAuto', Characteristic.TargetAirPurifierState.AUTO],
|
|
16
|
+
['valueModeManual', dependency.Characteristic.TargetAirPurifierState.MANUAL],
|
|
17
|
+
['valueModeAuto', dependency.Characteristic.TargetAirPurifierState.AUTO],
|
|
18
18
|
]);
|
|
19
19
|
const validCurrentStates = Array.from(this.CURRENT_STATE_MAP.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
|
|
20
20
|
if (validCurrentStates.length === 0) {
|
|
21
21
|
this.log.error(strings.purifier.noCurrentStateValues, this.name);
|
|
22
22
|
return;
|
|
23
23
|
}
|
|
24
|
-
this.setup(
|
|
24
|
+
this.setup(HKCharacteristicKey.CurrentAirPurifierState, this.CURRENT_STATE_MAP.get(validCurrentStates[0]), 'topicGetCurrentPurifierState', this.onCurrentStateUpdate.bind(this), true)
|
|
25
25
|
?.setProps({ validValues: validCurrentStates.map((key) => this.CURRENT_STATE_MAP.get(key)) });
|
|
26
26
|
const validTargetStates = Array.from(this.TARGET_STATE_MAP.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
|
|
27
27
|
if (validTargetStates.length === 0) {
|
|
28
28
|
this.log.error(strings.purifier.noTargetStateValues, this.name);
|
|
29
29
|
return;
|
|
30
30
|
}
|
|
31
|
-
this.setup(
|
|
31
|
+
this.setup(HKCharacteristicKey.TargetAirPurifierState, this.TARGET_STATE_MAP.get(validTargetStates[0]), 'topicGetTargetPurifierState', this.onTargetStateUpdate.bind(this), true, 'topicSetTargetPurifierState', this.onSetTargetState.bind(this))
|
|
32
32
|
?.setProps({ validValues: validTargetStates.map((key) => this.TARGET_STATE_MAP.get(key)) });
|
|
33
|
-
this.addTopicHandlers(FilterMaintenance.topicHandlers(Service, this, config));
|
|
33
|
+
this.addTopicHandlers(FilterMaintenance.topicHandlers(dependency.Service, this, dependency.config));
|
|
34
34
|
}
|
|
35
35
|
getAccessoryType() {
|
|
36
36
|
return AccessoryType.AirPurifier;
|
|
@@ -40,21 +40,21 @@ export class PurifierAccessory extends ActiveClimateAccessory {
|
|
|
40
40
|
if (state === undefined) {
|
|
41
41
|
return;
|
|
42
42
|
}
|
|
43
|
-
this.onUpdate(
|
|
43
|
+
this.onUpdate(HKCharacteristicKey.CurrentAirPurifierState, state, this.stateStringForCurrentCV(state));
|
|
44
44
|
}
|
|
45
45
|
async onTargetStateUpdate(_topic, value) {
|
|
46
46
|
const state = this.toTargetCVState(value);
|
|
47
47
|
if (state === undefined) {
|
|
48
48
|
return;
|
|
49
49
|
}
|
|
50
|
-
this.onUpdate(
|
|
50
|
+
this.onUpdate(HKCharacteristicKey.TargetAirPurifierState, state, this.stateStringForTargetCV(state));
|
|
51
51
|
}
|
|
52
52
|
async onSetTargetState(value) {
|
|
53
53
|
const target = this.fromCVState(value);
|
|
54
54
|
if (target === undefined) {
|
|
55
55
|
return;
|
|
56
56
|
}
|
|
57
|
-
this.onSet(
|
|
57
|
+
this.onSet(HKCharacteristicKey.TargetAirPurifierState, value, target, 'topicSetTargetPurifierState', this.stateStringForTargetCV(value));
|
|
58
58
|
}
|
|
59
59
|
fromCVState(value) {
|
|
60
60
|
let primative = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"purifier.js","sourceRoot":"","sources":["../../../src/accessory/climate/purifier.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"purifier.js","sourceRoot":"","sources":["../../../src/accessory/climate/purifier.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAG1E,MAAM,OAAO,iBAAkB,SAAQ,sBAAsC;IAE1D,iBAAiB,CAAoC;IACrD,gBAAgB,CAAoC;IAErE,YAAY,UAAmD;QAC7D,KAAK,CAAC,UAAU,CAAC,CAAC;QAElB,IAAI,CAAC,iBAAiB,GAAG,IAAI,GAAG,CAAC;YAC/B,CAAC,mBAAmB,EAAE,UAAU,CAAC,cAAc,CAAC,uBAAuB,CAAC,QAAQ,CAAC;YACjF,CAAC,eAAe,EAAE,UAAU,CAAC,cAAc,CAAC,uBAAuB,CAAC,IAAI,CAAC;YACzE,CAAC,oBAAoB,EAAE,UAAU,CAAC,cAAc,CAAC,uBAAuB,CAAC,aAAa,CAAC;SACxF,CAAC,CAAC;QAEH,IAAI,CAAC,gBAAgB,GAAG,IAAI,GAAG,CAAC;YAC9B,CAAC,iBAAiB,EAAE,UAAU,CAAC,cAAc,CAAC,sBAAsB,CAAC,MAAM,CAAC;YAC5E,CAAC,eAAe,EAAE,UAAU,CAAC,cAAc,CAAC,sBAAsB,CAAC,IAAI,CAAC;SACzE,CAAC,CAAC;QAEH,MAAM,kBAAkB,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,SAAS,CAAC,CAAC;QACjI,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACpC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACjE,OAAO;QACT,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,uBAAuB,EAAE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAE,EACxG,8BAA8B,EAAE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC;YAC3E,EAAE,QAAQ,CAAC,EAAE,WAAW,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,EAAE,CAAC,CAAC;QAEjG,MAAM,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,SAAS,CAAC,CAAC;QAC/H,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAChE,OAAO;QACT,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAE,EACrG,6BAA6B,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EACxE,6BAA6B,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChE,EAAE,QAAQ,CAAC,EAAE,WAAW,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,EAAE,CAAC,CAAC;QAE/F,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IACtG,CAAC;IAES,gBAAgB;QACxB,OAAO,aAAa,CAAC,WAAW,CAAC;IACnC,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,MAAc,EAAE,KAAqB;QACtE,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,uBAAuB,EAAE,KAAK,EAAE,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC,CAAC;IACzG,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,MAAc,EAAE,KAAqB;QACrE,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,KAAK,EAAE,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC;IACvG,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,KAA0B;QAEvD,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,sBAAsB,EAAE,KAAK,EAAE,MAAM,EAAE,6BAA6B,EAAE,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3I,CAAC;IAEO,WAAW,CAAC,KAA0B;QAE5C,IAAI,SAAS,GAAG,SAAS,CAAC;QAC1B,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YAC3C,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACnB,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,KAAK,GAAG,CAAC,CAAC;QACrE,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,gBAAgB,CAAC,KAAqB;QAC5C,QAAQ,KAAK,EAAE,CAAC;YAChB,KAAK,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,KAAK,CAAC;gBACrD,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;YACzD,KAAK,IAAI,CAAC,iBAAiB,CAAC,eAAe,EAAE,KAAK,CAAC;gBACjD,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YACrD,KAAK,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,EAAE,KAAK,CAAC;gBACtD,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAC1D,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,IAAI,KAAK,GAAG,CAAC,CAAC;IACjE,CAAC;IAEO,eAAe,CAAC,KAAqB;QAC3C,QAAQ,KAAK,EAAE,CAAC;YAChB,KAAK,IAAI,CAAC,iBAAiB,CAAC,eAAe,EAAE,KAAK,CAAC;gBACjD,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YACpD,KAAK,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,KAAK,CAAC;gBACnD,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QACtD,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,IAAI,KAAK,GAAG,CAAC,CAAC;IACjE,CAAC;IAEO,uBAAuB,CAAC,KAA0B;QACxD,QAAO,KAAK,EAAE,CAAC;YACf,KAAK,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC,QAAQ;gBACvD,OAAO,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;YACxC,KAAK,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC,IAAI;gBACnD,OAAO,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;YACpC,KAAK,IAAI,CAAC,cAAc,CAAC,uBAAuB,CAAC,aAAa;gBAC5D,OAAO,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;YACzC;gBACE,OAAO,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;QACvC,CAAC;IACH,CAAC;IAEO,sBAAsB,CAAC,KAA0B;QACvD,QAAO,KAAK,EAAE,CAAC;YACf,KAAK,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,IAAI;gBAClD,OAAO,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;YACpC,KAAK,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,MAAM;gBACpD,OAAO,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;YACtC;gBACE,OAAO,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;QACvC,CAAC;IACH,CAAC;CACF"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import { CharacteristicValue
|
|
1
|
+
import { CharacteristicValue } from 'homebridge';
|
|
2
2
|
import { BaseAccessory } from '../abstract/base.js';
|
|
3
|
-
import {
|
|
4
|
-
import { Log } from '../../tools/log.js';
|
|
3
|
+
import { MQTTAccessoryDependency, TemperatureControlConfig } from '../../model/types.js';
|
|
5
4
|
import { TemperatureUnits } from '../../tools/temperature.js';
|
|
6
5
|
export declare const DEFAULT_TEMPERATURE = 10;
|
|
7
6
|
export declare abstract class TemperatureControlAccessory<C extends TemperatureControlConfig = TemperatureControlConfig> extends BaseAccessory<C> {
|
|
8
|
-
constructor(
|
|
7
|
+
constructor(dependency: MQTTAccessoryDependency<C>);
|
|
9
8
|
protected setupTemperatureControlCharacteristics(): void;
|
|
10
9
|
protected get temperatureUnits(): TemperatureUnits;
|
|
11
10
|
private bindOnSetThreshold;
|
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
import { BaseAccessory } from '../abstract/base.js';
|
|
2
2
|
import { strings } from '../../i18n/i18n.js';
|
|
3
|
-
import {
|
|
3
|
+
import { HKCharacteristicKey } from '../../model/enums.js';
|
|
4
4
|
import { fromCelsius, temperatureUnits, TemperatureUnits } from '../../tools/temperature.js';
|
|
5
5
|
export const DEFAULT_TEMPERATURE = 10;
|
|
6
6
|
const DEFAULT_COOLING_THRESHOLD = 25;
|
|
7
7
|
const DEFAULT_HEATING_THRESHOLD = 20;
|
|
8
8
|
export class TemperatureControlAccessory extends BaseAccessory {
|
|
9
|
-
constructor(
|
|
10
|
-
super(
|
|
9
|
+
constructor(dependency) {
|
|
10
|
+
super(dependency);
|
|
11
11
|
}
|
|
12
12
|
setupTemperatureControlCharacteristics() {
|
|
13
13
|
const temperatureDisplayUnits = this.temperatureUnits === TemperatureUnits.FAHRENHEIT
|
|
14
14
|
? this.Characteristic.TemperatureDisplayUnits.FAHRENHEIT : this.Characteristic.TemperatureDisplayUnits.CELSIUS;
|
|
15
|
-
this.setCharacteristicValue(
|
|
16
|
-
this.setup(
|
|
17
|
-
this.setup(
|
|
18
|
-
this.setup(
|
|
15
|
+
this.setCharacteristicValue(HKCharacteristicKey.TemperatureDisplayUnits, temperatureDisplayUnits);
|
|
16
|
+
this.setup(HKCharacteristicKey.CurrentTemperature, DEFAULT_TEMPERATURE, 'topicGetCurrentTemperature', this.bindOnUpdateTemperature(this.config, HKCharacteristicKey.CurrentTemperature, strings.climate.temperatureUpdate), true);
|
|
17
|
+
this.setup(HKCharacteristicKey.CoolingThresholdTemperature, DEFAULT_COOLING_THRESHOLD, 'topicGetCoolingThresholdTemperature', this.bindOnUpdateTemperature(this.config, HKCharacteristicKey.CoolingThresholdTemperature, strings.climate.coolingThreshold), false, 'topicSetCoolingThresholdTemperature', this.bindOnSetThreshold(HKCharacteristicKey.CoolingThresholdTemperature, 'topicSetCoolingThresholdTemperature', strings.climate.coolingThresholdFuture));
|
|
18
|
+
this.setup(HKCharacteristicKey.HeatingThresholdTemperature, DEFAULT_HEATING_THRESHOLD, 'topicGetHeatingThresholdTemperature', this.bindOnUpdateTemperature(this.config, HKCharacteristicKey.HeatingThresholdTemperature, strings.climate.heatingThreshold), false, 'topicSetHeatingThresholdTemperature', this.bindOnSetThreshold(HKCharacteristicKey.HeatingThresholdTemperature, 'topicSetHeatingThresholdTemperature', strings.climate.heatingThresholdFuture));
|
|
19
19
|
}
|
|
20
20
|
get temperatureUnits() {
|
|
21
21
|
return temperatureUnits(this.config.temperatureUnits);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"temperatureControl.js","sourceRoot":"","sources":["../../../src/accessory/climate/temperatureControl.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"temperatureControl.js","sourceRoot":"","sources":["../../../src/accessory/climate/temperatureControl.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
import { PlatformAccessory } from 'homebridge';
|
|
2
1
|
import { TemperatureControlAccessory } from './temperatureControl.js';
|
|
3
2
|
import { AccessoryType } from '../../model/enums.js';
|
|
4
|
-
import {
|
|
5
|
-
import { Log } from '../../tools/log.js';
|
|
3
|
+
import { MQTTAccessoryDependency, ThermostatConfig } from '../../model/types.js';
|
|
6
4
|
export declare class ThermostatAccessory extends TemperatureControlAccessory<ThermostatConfig> {
|
|
7
5
|
private readonly STATE_MAP;
|
|
8
|
-
constructor(
|
|
6
|
+
constructor(dependency: MQTTAccessoryDependency<ThermostatConfig>);
|
|
9
7
|
protected getAccessoryType(): AccessoryType;
|
|
10
8
|
private bindOnStateUpdate;
|
|
11
9
|
private onSetTargetState;
|
|
@@ -1,30 +1,30 @@
|
|
|
1
1
|
import { TemperatureControlAccessory, DEFAULT_TEMPERATURE } from './temperatureControl.js';
|
|
2
2
|
import { strings } from '../../i18n/i18n.js';
|
|
3
|
-
import { AccessoryType,
|
|
3
|
+
import { AccessoryType, HKCharacteristicKey } from '../../model/enums.js';
|
|
4
4
|
export class ThermostatAccessory extends TemperatureControlAccessory {
|
|
5
5
|
STATE_MAP;
|
|
6
|
-
constructor(
|
|
7
|
-
super(
|
|
6
|
+
constructor(dependency) {
|
|
7
|
+
super(dependency);
|
|
8
8
|
this.setupTemperatureControlCharacteristics();
|
|
9
9
|
this.STATE_MAP = new Map([
|
|
10
|
-
['valueModeOff', Characteristic.TargetHeatingCoolingState.OFF],
|
|
11
|
-
['valueModeHeat', Characteristic.TargetHeatingCoolingState.HEAT],
|
|
12
|
-
['valueModeCool', Characteristic.TargetHeatingCoolingState.COOL],
|
|
13
|
-
['valueModeAuto', Characteristic.TargetHeatingCoolingState.AUTO],
|
|
10
|
+
['valueModeOff', dependency.Characteristic.TargetHeatingCoolingState.OFF],
|
|
11
|
+
['valueModeHeat', dependency.Characteristic.TargetHeatingCoolingState.HEAT],
|
|
12
|
+
['valueModeCool', dependency.Characteristic.TargetHeatingCoolingState.COOL],
|
|
13
|
+
['valueModeAuto', dependency.Characteristic.TargetHeatingCoolingState.AUTO],
|
|
14
14
|
]);
|
|
15
15
|
const validTargetStates = Array.from(this.STATE_MAP.keys()).filter((key) => this.getRawValue(key, false) !== undefined);
|
|
16
16
|
if (validTargetStates.length === 0 || (validTargetStates.length === 1 && validTargetStates[0] === 'valueModeAuto')) {
|
|
17
17
|
this.log.error(strings.thermostat.noStateValues, this.name);
|
|
18
18
|
return;
|
|
19
19
|
}
|
|
20
|
-
this.setup(
|
|
20
|
+
this.setup(HKCharacteristicKey.TargetHeatingCoolingState, this.STATE_MAP.get(validTargetStates[0]), 'topicGetTargetHeatingCoolingState', this.bindOnStateUpdate(HKCharacteristicKey.TargetHeatingCoolingState, true), true, 'topicSetTargetHeatingCoolingState', this.onSetTargetState.bind(this))
|
|
21
21
|
?.setProps({ validValues: validTargetStates.map((key) => this.STATE_MAP.get(key)) });
|
|
22
22
|
const validCurrentStates = validTargetStates.filter((key) => key !== 'valueModeAuto');
|
|
23
|
-
this.setup(
|
|
23
|
+
this.setup(HKCharacteristicKey.CurrentHeatingCoolingState, this.STATE_MAP.get(validCurrentStates[0]), 'topicGetCurrentHeatingCoolingState', this.bindOnStateUpdate(HKCharacteristicKey.CurrentHeatingCoolingState), true)
|
|
24
24
|
?.setProps({ validValues: validCurrentStates.map((key) => this.STATE_MAP.get(key)) });
|
|
25
|
-
this.setup(
|
|
26
|
-
this.setup(
|
|
27
|
-
this.setup(
|
|
25
|
+
this.setup(HKCharacteristicKey.TargetTemperature, DEFAULT_TEMPERATURE, 'topicGetTargetTemperature', this.bindOnUpdateTemperature(dependency.config, HKCharacteristicKey.TargetTemperature, strings.thermostat.temperatureTarget), true, 'topicSetTargetTemperature', this.onSetTemperature.bind(this));
|
|
26
|
+
this.setup(HKCharacteristicKey.CurrentRelativeHumidity, 0, 'topicGetCurrentRelativeHumidity', this.bindOnUpdateNumeric(HKCharacteristicKey.CurrentRelativeHumidity, strings.climate.humidityUpdate), false);
|
|
27
|
+
this.setup(HKCharacteristicKey.TargetRelativeHumidity, 0, 'topicGetTargetRelativeHumidity', this.bindOnUpdateNumeric(HKCharacteristicKey.TargetRelativeHumidity, strings.thermostat.humidityFuture), false, 'topicSetTargetRelativeHumidity', this.onSetHumidity.bind(this));
|
|
28
28
|
}
|
|
29
29
|
getAccessoryType() {
|
|
30
30
|
return AccessoryType.Thermostat;
|
|
@@ -43,16 +43,16 @@ export class ThermostatAccessory extends TemperatureControlAccessory {
|
|
|
43
43
|
if (target === undefined) {
|
|
44
44
|
return;
|
|
45
45
|
}
|
|
46
|
-
this.onSet(
|
|
46
|
+
this.onSet(HKCharacteristicKey.TargetHeatingCoolingState, value, target, 'topicSetTargetHeatingCoolingState', this.stateStringForCV(value, true));
|
|
47
47
|
}
|
|
48
48
|
async onSetTemperature(value) {
|
|
49
49
|
const temperature = this.temperatureFromCV(value);
|
|
50
50
|
const logString = strings.thermostat.temperatureTargetFuture.replace('%d°%s', `${temperature}°${this.temperatureUnits}`);
|
|
51
|
-
this.onSet(
|
|
51
|
+
this.onSet(HKCharacteristicKey.TargetTemperature, value, temperature, 'topicSetTargetTemperature', logString);
|
|
52
52
|
}
|
|
53
53
|
async onSetHumidity(value) {
|
|
54
54
|
const logString = strings.thermostat.humidityFuture.replace('%d', value.toString());
|
|
55
|
-
this.onSet(
|
|
55
|
+
this.onSet(HKCharacteristicKey.TargetRelativeHumidity, value, value, 'topicSetTargetRelativeHumidity', logString);
|
|
56
56
|
}
|
|
57
57
|
fromCVState(value) {
|
|
58
58
|
let primative = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thermostat.js","sourceRoot":"","sources":["../../../src/accessory/climate/thermostat.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,2BAA2B,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE3F,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"thermostat.js","sourceRoot":"","sources":["../../../src/accessory/climate/thermostat.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
import { PlatformAccessory } from 'homebridge';
|
|
2
1
|
import { LockMechanismAccessory } from './lock.js';
|
|
3
2
|
import { AccessoryType } from '../model/enums.js';
|
|
4
|
-
import {
|
|
5
|
-
import { Log } from '../tools/log.js';
|
|
3
|
+
import { GarageDoorConfig, MQTTAccessoryDependency } from '../model/types.js';
|
|
6
4
|
export declare class GarageDoorAccessory extends LockMechanismAccessory<GarageDoorConfig> {
|
|
7
5
|
private readonly STATE_MAP;
|
|
8
|
-
constructor(
|
|
6
|
+
constructor(dependency: MQTTAccessoryDependency<GarageDoorConfig>);
|
|
9
7
|
protected getAccessoryType(): AccessoryType;
|
|
10
8
|
private onCurrentDoorStateUpdate;
|
|
11
9
|
private onTargetDoorStateUpdate;
|