hoffmation-base 2.19.0 → 2.19.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/lib/models/deviceSettings/heaterSettings.d.ts +5 -0
- package/lib/models/deviceSettings/heaterSettings.js +7 -1
- package/lib/server/devices/hmIPDevices/hmIpHeizgruppe.js +4 -0
- package/lib/server/devices/shelly/shellyTrv.js +3 -1
- package/lib/server/devices/zigbee/BaseDevices/zigbeeHeater.js +4 -0
- package/lib/server/devices/zigbee/zigbeeEuroHeater.js +5 -0
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +16 -16
|
@@ -30,6 +30,11 @@ export declare class HeaterSettings extends DeviceSettings {
|
|
|
30
30
|
* @type {number}
|
|
31
31
|
*/
|
|
32
32
|
pidForcedMinimum: number;
|
|
33
|
+
/**
|
|
34
|
+
* Whether this AC should be turned off for some time manually
|
|
35
|
+
* @type {boolean}
|
|
36
|
+
*/
|
|
37
|
+
manualDisabled: boolean;
|
|
33
38
|
fromPartialObject(data: Partial<HeaterSettings>): void;
|
|
34
39
|
protected toJSON(): Partial<HeaterSettings>;
|
|
35
40
|
}
|
|
@@ -36,9 +36,14 @@ class HeaterSettings extends deviceSettings_1.DeviceSettings {
|
|
|
36
36
|
* @type {number}
|
|
37
37
|
*/
|
|
38
38
|
this.pidForcedMinimum = 1;
|
|
39
|
+
/**
|
|
40
|
+
* Whether this AC should be turned off for some time manually
|
|
41
|
+
* @type {boolean}
|
|
42
|
+
*/
|
|
43
|
+
this.manualDisabled = false;
|
|
39
44
|
}
|
|
40
45
|
fromPartialObject(data) {
|
|
41
|
-
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
46
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
42
47
|
this.automaticMode = (_a = data.automaticMode) !== null && _a !== void 0 ? _a : this.automaticMode;
|
|
43
48
|
this.useOwnTemperatur = (_b = data.useOwnTemperatur) !== null && _b !== void 0 ? _b : this.useOwnTemperatur;
|
|
44
49
|
this.controlByPid = (_c = data.controlByPid) !== null && _c !== void 0 ? _c : this.controlByPid;
|
|
@@ -47,6 +52,7 @@ class HeaterSettings extends deviceSettings_1.DeviceSettings {
|
|
|
47
52
|
this.seasonTurnOffDay = (_f = data.seasonTurnOffDay) !== null && _f !== void 0 ? _f : this.seasonTurnOffDay;
|
|
48
53
|
this.seasonTurnOnDay = (_g = data.seasonTurnOnDay) !== null && _g !== void 0 ? _g : this.seasonTurnOnDay;
|
|
49
54
|
this.pidForcedMinimum = (_h = data.pidForcedMinimum) !== null && _h !== void 0 ? _h : this.pidForcedMinimum;
|
|
55
|
+
this.manualDisabled = (_j = data.manualDisabled) !== null && _j !== void 0 ? _j : this.manualDisabled;
|
|
50
56
|
super.fromPartialObject(data);
|
|
51
57
|
}
|
|
52
58
|
toJSON() {
|
|
@@ -130,6 +130,10 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
|
|
|
130
130
|
if (!this._initialSeasonCheckDone) {
|
|
131
131
|
this.checkSeasonTurnOff();
|
|
132
132
|
}
|
|
133
|
+
if (this.seasonTurnOff || this.settings.manualDisabled) {
|
|
134
|
+
this.seasonTurnOff = true;
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
133
137
|
const heatGroupSettings = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup) === null || _b === void 0 ? void 0 : _b.settings;
|
|
134
138
|
if (!this.settings.automaticMode || this.seasonTurnOff || (heatGroupSettings === null || heatGroupSettings === void 0 ? void 0 : heatGroupSettings.automaticMode) === false) {
|
|
135
139
|
return;
|
|
@@ -126,7 +126,9 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
|
|
|
126
126
|
if (!this._initialSeasonCheckDone) {
|
|
127
127
|
this.checkSeasonTurnOff();
|
|
128
128
|
}
|
|
129
|
-
if (this.seasonTurnOff) {
|
|
129
|
+
if (this.seasonTurnOff || this.settings.manualDisabled) {
|
|
130
|
+
this.setValve(0);
|
|
131
|
+
this.setMode(false);
|
|
130
132
|
return;
|
|
131
133
|
}
|
|
132
134
|
if (this.settings.pidForcedMinimum !== this.minimumLevel) {
|
|
@@ -96,6 +96,10 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
|
|
|
96
96
|
this.checkSeasonTurnOff();
|
|
97
97
|
}
|
|
98
98
|
const heatGroup = this.room.HeatGroup;
|
|
99
|
+
if (this.seasonTurnOff || this.settings.manualDisabled) {
|
|
100
|
+
this.desiredTemperature = 0;
|
|
101
|
+
return;
|
|
102
|
+
}
|
|
99
103
|
if (!this.settings.automaticMode || this.seasonTurnOff || ((_a = heatGroup === null || heatGroup === void 0 ? void 0 : heatGroup.settings) === null || _a === void 0 ? void 0 : _a.automaticMode) === false) {
|
|
100
104
|
return;
|
|
101
105
|
}
|
|
@@ -102,6 +102,11 @@ class ZigbeeEuroHeater extends BaseDevices_1.ZigbeeHeater {
|
|
|
102
102
|
super.update(idSplit, state, initial, true);
|
|
103
103
|
}
|
|
104
104
|
recalcLevel() {
|
|
105
|
+
if (this.seasonTurnOff || this.settings.manualDisabled) {
|
|
106
|
+
this.setValve(0);
|
|
107
|
+
this.setMode(1);
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
105
110
|
if (this.settings.useOwnTemperatur || this.seasonTurnOff) {
|
|
106
111
|
return;
|
|
107
112
|
}
|