hoffmation-base 2.17.4 → 2.18.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/lib/models/deviceSettings/heaterSettings.d.ts +0 -1
  2. package/lib/models/deviceSettings/heaterSettings.js +8 -10
  3. package/lib/models/groupSettings/heatGroupSettings.d.ts +1 -0
  4. package/lib/models/groupSettings/heatGroupSettings.js +3 -1
  5. package/lib/server/devices/hmIPDevices/hmIpHeizgruppe.js +5 -9
  6. package/lib/server/devices/shelly/shellyTrv.js +5 -9
  7. package/lib/server/devices/zigbee/BaseDevices/zigbeeHeater.js +5 -9
  8. package/lib/tsconfig.tsbuildinfo +1 -1
  9. package/package.json +1 -1
package/lib/models/deviceSettings/heaterSettings.d.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  import { DeviceSettings } from './deviceSettings';
2
2
  export declare class HeaterSettings extends DeviceSettings {
3
3
  automaticMode: boolean;
4
- automaticFallBackTemperatur: number;
5
4
  useOwnTemperatur: boolean;
6
5
  /**
7
6
  * Whether this device should be controlled using only valve position
package/lib/models/deviceSettings/heaterSettings.js CHANGED
@@ -7,7 +7,6 @@ class HeaterSettings extends deviceSettings_1.DeviceSettings {
7
7
  constructor() {
8
8
  super(...arguments);
9
9
  this.automaticMode = true;
10
- this.automaticFallBackTemperatur = 20;
11
10
  this.useOwnTemperatur = true;
12
11
  /**
13
12
  * Whether this device should be controlled using only valve position
@@ -39,16 +38,15 @@ class HeaterSettings extends deviceSettings_1.DeviceSettings {
39
38
  this.pidForcedMinimum = 1;
40
39
  }
41
40
  fromPartialObject(data) {
42
- var _a, _b, _c, _d, _e, _f, _g, _h, _j;
41
+ var _a, _b, _c, _d, _e, _f, _g, _h;
43
42
  this.automaticMode = (_a = data.automaticMode) !== null && _a !== void 0 ? _a : this.automaticMode;
44
- this.automaticFallBackTemperatur = (_b = data.automaticFallBackTemperatur) !== null && _b !== void 0 ? _b : this.automaticFallBackTemperatur;
45
- this.useOwnTemperatur = (_c = data.useOwnTemperatur) !== null && _c !== void 0 ? _c : this.useOwnTemperatur;
46
- this.controlByPid = (_d = data.controlByPid) !== null && _d !== void 0 ? _d : this.controlByPid;
47
- this.controlByTempDiff = (_e = data.controlByTempDiff) !== null && _e !== void 0 ? _e : this.controlByTempDiff;
48
- this.seasonalTurnOffActive = (_f = data.seasonalTurnOffActive) !== null && _f !== void 0 ? _f : this.seasonalTurnOffActive;
49
- this.seasonTurnOffDay = (_g = data.seasonTurnOffDay) !== null && _g !== void 0 ? _g : this.seasonTurnOffDay;
50
- this.seasonTurnOnDay = (_h = data.seasonTurnOnDay) !== null && _h !== void 0 ? _h : this.seasonTurnOnDay;
51
- this.pidForcedMinimum = (_j = data.pidForcedMinimum) !== null && _j !== void 0 ? _j : this.pidForcedMinimum;
43
+ this.useOwnTemperatur = (_b = data.useOwnTemperatur) !== null && _b !== void 0 ? _b : this.useOwnTemperatur;
44
+ this.controlByPid = (_c = data.controlByPid) !== null && _c !== void 0 ? _c : this.controlByPid;
45
+ this.controlByTempDiff = (_d = data.controlByTempDiff) !== null && _d !== void 0 ? _d : this.controlByTempDiff;
46
+ this.seasonalTurnOffActive = (_e = data.seasonalTurnOffActive) !== null && _e !== void 0 ? _e : this.seasonalTurnOffActive;
47
+ this.seasonTurnOffDay = (_f = data.seasonTurnOffDay) !== null && _f !== void 0 ? _f : this.seasonTurnOffDay;
48
+ this.seasonTurnOnDay = (_g = data.seasonTurnOnDay) !== null && _g !== void 0 ? _g : this.seasonTurnOnDay;
49
+ this.pidForcedMinimum = (_h = data.pidForcedMinimum) !== null && _h !== void 0 ? _h : this.pidForcedMinimum;
52
50
  super.fromPartialObject(data);
53
51
  }
54
52
  toJSON() {
package/lib/models/groupSettings/heatGroupSettings.d.ts CHANGED
@@ -4,6 +4,7 @@ import { GroupSettings } from './groupSettings';
4
4
  export declare class HeatGroupSettings extends GroupSettings {
5
5
  automaticPoints: TemperatureSettings[];
6
6
  automaticMode: boolean;
7
+ automaticFallBackTemperatur: number;
7
8
  /**
8
9
  * Target temperature when automaticMode is disabled
9
10
  * @type {number}
package/lib/models/groupSettings/heatGroupSettings.js CHANGED
@@ -8,6 +8,7 @@ class HeatGroupSettings extends groupSettings_1.GroupSettings {
8
8
  super(...arguments);
9
9
  this.automaticPoints = [];
10
10
  this.automaticMode = true;
11
+ this.automaticFallBackTemperatur = 20;
11
12
  /**
12
13
  * Target temperature when automaticMode is disabled
13
14
  * @type {number}
@@ -15,10 +16,11 @@ class HeatGroupSettings extends groupSettings_1.GroupSettings {
15
16
  this.manualTemperature = 20;
16
17
  }
17
18
  fromPartialObject(data) {
18
- var _a, _b, _c;
19
+ var _a, _b, _c, _d;
19
20
  this.automaticPoints = (_a = data.automaticPoints) !== null && _a !== void 0 ? _a : this.automaticPoints;
20
21
  this.automaticMode = (_b = data.automaticMode) !== null && _b !== void 0 ? _b : this.automaticMode;
21
22
  this.manualTemperature = (_c = data.manualTemperature) !== null && _c !== void 0 ? _c : this.manualTemperature;
23
+ this.automaticFallBackTemperatur = (_d = data.automaticFallBackTemperatur) !== null && _d !== void 0 ? _d : this.automaticFallBackTemperatur;
22
24
  super.fromPartialObject(data);
23
25
  }
24
26
  toJSON() {
package/lib/server/devices/hmIPDevices/hmIpHeizgruppe.js CHANGED
@@ -129,7 +129,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
129
129
  }
130
130
  }
131
131
  checkAutomaticChange() {
132
- var _a, _b, _c, _d, _e, _f, _g;
132
+ var _a, _b, _c, _d, _e, _f, _g, _h;
133
133
  if (!this._initialSeasonCheckDone) {
134
134
  this.checkSeasonTurnOff();
135
135
  }
@@ -138,14 +138,10 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
138
138
  return;
139
139
  }
140
140
  const setting = models_1.TemperatureSettings.getActiveSetting((_f = (_e = (_d = (_c = this.room) === null || _c === void 0 ? void 0 : _c.HeatGroup) === null || _d === void 0 ? void 0 : _d.settings) === null || _e === void 0 ? void 0 : _e.automaticPoints) !== null && _f !== void 0 ? _f : [], new Date());
141
- if (setting === undefined) {
142
- this.log(models_1.LogLevel.Warn, `Undefined Heating Timestamp.`);
143
- this.desiredTemperature = this.settings.automaticFallBackTemperatur;
144
- return;
145
- }
146
- if (this._desiredTemperature !== setting.temperature) {
147
- this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${setting.temperature}°C`);
148
- this.desiredTemperature = (_g = setting.temperature) !== null && _g !== void 0 ? _g : this.settings.automaticFallBackTemperatur;
141
+ const targetTemp = (_h = (_g = setting === null || setting === void 0 ? void 0 : setting.temperature) !== null && _g !== void 0 ? _g : heatGroupSettings === null || heatGroupSettings === void 0 ? void 0 : heatGroupSettings.automaticFallBackTemperatur) !== null && _h !== void 0 ? _h : 20;
142
+ if (this._desiredTemperature !== targetTemp) {
143
+ this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${targetTemp}°C`);
144
+ this.desiredTemperature = targetTemp;
149
145
  }
150
146
  }
151
147
  addTempChangeCallback(pCallback) {
package/lib/server/devices/shelly/shellyTrv.js CHANGED
@@ -119,7 +119,7 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
119
119
  }
120
120
  }
121
121
  checkAutomaticChange() {
122
- var _a, _b, _c, _d, _e, _f;
122
+ var _a, _b, _c, _d, _e, _f, _g, _h;
123
123
  if (!this._initialSeasonCheckDone) {
124
124
  this.checkSeasonTurnOff();
125
125
  }
@@ -138,14 +138,10 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
138
138
  return;
139
139
  }
140
140
  const setting = models_1.TemperatureSettings.getActiveSetting((_f = (_e = (_d = (_c = this.room) === null || _c === void 0 ? void 0 : _c.HeatGroup) === null || _d === void 0 ? void 0 : _d.settings) === null || _e === void 0 ? void 0 : _e.automaticPoints) !== null && _f !== void 0 ? _f : [], new Date());
141
- if (setting === undefined) {
142
- this.log(models_1.LogLevel.Warn, `Undefined Heating Timestamp.`);
143
- this.desiredTemperature = this.settings.automaticFallBackTemperatur;
144
- return;
145
- }
146
- if (this._desiredTemperatur !== setting.temperature) {
147
- this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${setting.temperature}°C`);
148
- this.desiredTemperature = setting.temperature;
141
+ const targetTemperature = (_h = (_g = setting === null || setting === void 0 ? void 0 : setting.temperature) !== null && _g !== void 0 ? _g : heatGroupSettings === null || heatGroupSettings === void 0 ? void 0 : heatGroupSettings.automaticFallBackTemperatur) !== null && _h !== void 0 ? _h : 20;
142
+ if (this._desiredTemperatur !== targetTemperature) {
143
+ this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${targetTemperature}°C`);
144
+ this.desiredTemperature = targetTemperature;
149
145
  }
150
146
  }
151
147
  stopAutomaticCheck() {
package/lib/server/devices/zigbee/BaseDevices/zigbeeHeater.js CHANGED
@@ -91,7 +91,7 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
91
91
  this._roomTemperature = val;
92
92
  }
93
93
  checkAutomaticChange() {
94
- var _a, _b, _c, _d, _e, _f;
94
+ var _a, _b, _c, _d, _e, _f, _g, _h;
95
95
  if (!this._initialSeasonCheckDone) {
96
96
  this.checkSeasonTurnOff();
97
97
  }
@@ -100,14 +100,10 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
100
100
  return;
101
101
  }
102
102
  const setting = models_1.TemperatureSettings.getActiveSetting((_f = (_e = (_d = (_c = this.room) === null || _c === void 0 ? void 0 : _c.HeatGroup) === null || _d === void 0 ? void 0 : _d.settings) === null || _e === void 0 ? void 0 : _e.automaticPoints) !== null && _f !== void 0 ? _f : [], new Date());
103
- if (setting === undefined) {
104
- this.log(models_1.LogLevel.Warn, `Undefined Heating Timestamp.`);
105
- this.desiredTemperature = this.settings.automaticFallBackTemperatur;
106
- return;
107
- }
108
- if (this._desiredTemperatur !== setting.temperature) {
109
- this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${setting.temperature}°C`);
110
- this.desiredTemperature = setting.temperature;
103
+ const targetTemperature = (_h = (_g = setting === null || setting === void 0 ? void 0 : setting.temperature) !== null && _g !== void 0 ? _g : heatGroupSettings === null || heatGroupSettings === void 0 ? void 0 : heatGroupSettings.automaticFallBackTemperatur) !== null && _h !== void 0 ? _h : 20;
104
+ if (this._desiredTemperatur !== targetTemperature) {
105
+ this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${targetTemperature}°C`);
106
+ this.desiredTemperature = targetTemperature;
111
107
  }
112
108
  }
113
109
  stopAutomaticCheck() {