hoffmation-base 2.17.4 → 2.18.1

package/lib/models/deviceSettings/heaterSettings.d.ts

@@ -1,7 +1,6 @@
 import { DeviceSettings } from './deviceSettings';
 export declare class HeaterSettings extends DeviceSettings {
     automaticMode: boolean;
-    automaticFallBackTemperatur: number;
     useOwnTemperatur: boolean;
     /**
      * Whether this device should be controlled using only valve position

package/lib/models/deviceSettings/heaterSettings.js

@@ -7,7 +7,6 @@ class HeaterSettings extends deviceSettings_1.DeviceSettings {
     constructor() {
         super(...arguments);
         this.automaticMode = true;
-        this.automaticFallBackTemperatur = 20;
         this.useOwnTemperatur = true;
         /**
          * Whether this device should be controlled using only valve position
@@ -39,16 +38,15 @@ class HeaterSettings extends deviceSettings_1.DeviceSettings {
         this.pidForcedMinimum = 1;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         this.automaticMode = (_a = data.automaticMode) !== null && _a !== void 0 ? _a : this.automaticMode;
-        this.automaticFallBackTemperatur = (_b = data.automaticFallBackTemperatur) !== null && _b !== void 0 ? _b : this.automaticFallBackTemperatur;
-        this.useOwnTemperatur = (_c = data.useOwnTemperatur) !== null && _c !== void 0 ? _c : this.useOwnTemperatur;
-        this.controlByPid = (_d = data.controlByPid) !== null && _d !== void 0 ? _d : this.controlByPid;
-        this.controlByTempDiff = (_e = data.controlByTempDiff) !== null && _e !== void 0 ? _e : this.controlByTempDiff;
-        this.seasonalTurnOffActive = (_f = data.seasonalTurnOffActive) !== null && _f !== void 0 ? _f : this.seasonalTurnOffActive;
-        this.seasonTurnOffDay = (_g = data.seasonTurnOffDay) !== null && _g !== void 0 ? _g : this.seasonTurnOffDay;
-        this.seasonTurnOnDay = (_h = data.seasonTurnOnDay) !== null && _h !== void 0 ? _h : this.seasonTurnOnDay;
-        this.pidForcedMinimum = (_j = data.pidForcedMinimum) !== null && _j !== void 0 ? _j : this.pidForcedMinimum;
+        this.useOwnTemperatur = (_b = data.useOwnTemperatur) !== null && _b !== void 0 ? _b : this.useOwnTemperatur;
+        this.controlByPid = (_c = data.controlByPid) !== null && _c !== void 0 ? _c : this.controlByPid;
+        this.controlByTempDiff = (_d = data.controlByTempDiff) !== null && _d !== void 0 ? _d : this.controlByTempDiff;
+        this.seasonalTurnOffActive = (_e = data.seasonalTurnOffActive) !== null && _e !== void 0 ? _e : this.seasonalTurnOffActive;
+        this.seasonTurnOffDay = (_f = data.seasonTurnOffDay) !== null && _f !== void 0 ? _f : this.seasonTurnOffDay;
+        this.seasonTurnOnDay = (_g = data.seasonTurnOnDay) !== null && _g !== void 0 ? _g : this.seasonTurnOnDay;
+        this.pidForcedMinimum = (_h = data.pidForcedMinimum) !== null && _h !== void 0 ? _h : this.pidForcedMinimum;
         super.fromPartialObject(data);
     }
     toJSON() {

package/lib/models/groupSettings/heatGroupSettings.d.ts

@@ -4,6 +4,7 @@ import { GroupSettings } from './groupSettings';
 export declare class HeatGroupSettings extends GroupSettings {
     automaticPoints: TemperatureSettings[];
     automaticMode: boolean;
+    automaticFallBackTemperatur: number;
     /**
      * Target temperature when automaticMode is disabled
      * @type {number}

package/lib/models/groupSettings/heatGroupSettings.js

@@ -8,6 +8,7 @@ class HeatGroupSettings extends groupSettings_1.GroupSettings {
         super(...arguments);
         this.automaticPoints = [];
         this.automaticMode = true;
+        this.automaticFallBackTemperatur = 20;
         /**
          * Target temperature when automaticMode is disabled
          * @type {number}
@@ -15,10 +16,11 @@ class HeatGroupSettings extends groupSettings_1.GroupSettings {
         this.manualTemperature = 20;
     }
     fromPartialObject(data) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         this.automaticPoints = (_a = data.automaticPoints) !== null && _a !== void 0 ? _a : this.automaticPoints;
         this.automaticMode = (_b = data.automaticMode) !== null && _b !== void 0 ? _b : this.automaticMode;
         this.manualTemperature = (_c = data.manualTemperature) !== null && _c !== void 0 ? _c : this.manualTemperature;
+        this.automaticFallBackTemperatur = (_d = data.automaticFallBackTemperatur) !== null && _d !== void 0 ? _d : this.automaticFallBackTemperatur;
         super.fromPartialObject(data);
     }
     toJSON() {

package/lib/server/devices/groups/heatGroup.d.ts

@@ -32,5 +32,4 @@ export declare class HeatGroup extends BaseGroup {
     deleteAutomaticPoint(name: string): void;
     setAutomaticPoint(setting: TemperatureSettings): void;
     private recalcRoomTemperatur;
-    getTargetTemperature(): number;
 }

package/lib/server/devices/groups/heatGroup.js

@@ -76,14 +76,14 @@ class HeatGroup extends base_group_1.BaseGroup {
         return temp;
     }
     get desiredTemp() {
-        if (this.getHeater().length === 0) {
-            return -99;
+        if (!this.settings.automaticMode) {
+            return this.settings.manualTemperature;
         }
-        let value = 0;
-        for (const h of this.getHeater()) {
-            value += h.desiredTemperature;
+        const activeSetting = models_1.TemperatureSettings.getActiveSetting(this.settings.automaticPoints, new Date());
+        if (!activeSetting) {
+            return this.settings.automaticFallBackTemperatur;
         }
-        return Math.round((value / this.getHeater().length) * 10) / 10;
+        return activeSetting.temperature;
     }
     static getInfo() {
         var _a, _b, _c;
@@ -162,15 +162,5 @@ class HeatGroup extends base_group_1.BaseGroup {
             ac.onTemperaturChange(temp);
         });
     }
-    getTargetTemperature() {
-        if (!this.settings.automaticMode) {
-            return this.settings.manualTemperature;
-        }
-        const activeSetting = models_1.TemperatureSettings.getActiveSetting(this.settings.automaticPoints, new Date());
-        if (!activeSetting) {
-            return this.settings.manualTemperature;
-        }
-        return activeSetting.temperature;
-    }
 }
 exports.HeatGroup = HeatGroup;

package/lib/server/devices/hmIPDevices/hmIpHeizgruppe.js

@@ -129,7 +129,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         }
     }
     checkAutomaticChange() {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         if (!this._initialSeasonCheckDone) {
             this.checkSeasonTurnOff();
         }
@@ -138,14 +138,10 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
             return;
         }
         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());
-        if (setting === undefined) {
-            this.log(models_1.LogLevel.Warn, `Undefined Heating Timestamp.`);
-            this.desiredTemperature = this.settings.automaticFallBackTemperatur;
-            return;
-        }
-        if (this._desiredTemperature !== setting.temperature) {
-            this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${setting.temperature}°C`);
-            this.desiredTemperature = (_g = setting.temperature) !== null && _g !== void 0 ? _g : this.settings.automaticFallBackTemperatur;
+        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;
+        if (this._desiredTemperature !== targetTemp) {
+            this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${targetTemp}°C`);
+            this.desiredTemperature = targetTemp;
         }
     }
     addTempChangeCallback(pCallback) {

package/lib/server/devices/shelly/shellyTrv.js

@@ -119,7 +119,7 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         }
     }
     checkAutomaticChange() {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         if (!this._initialSeasonCheckDone) {
             this.checkSeasonTurnOff();
         }
@@ -138,14 +138,10 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
             return;
         }
         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());
-        if (setting === undefined) {
-            this.log(models_1.LogLevel.Warn, `Undefined Heating Timestamp.`);
-            this.desiredTemperature = this.settings.automaticFallBackTemperatur;
-            return;
-        }
-        if (this._desiredTemperatur !== setting.temperature) {
-            this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${setting.temperature}°C`);
-            this.desiredTemperature = setting.temperature;
+        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;
+        if (this._desiredTemperatur !== targetTemperature) {
+            this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${targetTemperature}°C`);
+            this.desiredTemperature = targetTemperature;
         }
     }
     stopAutomaticCheck() {

package/lib/server/devices/zigbee/BaseDevices/zigbeeHeater.js

@@ -91,7 +91,7 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         this._roomTemperature = val;
     }
     checkAutomaticChange() {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         if (!this._initialSeasonCheckDone) {
             this.checkSeasonTurnOff();
         }
@@ -100,14 +100,10 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
             return;
         }
         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());
-        if (setting === undefined) {
-            this.log(models_1.LogLevel.Warn, `Undefined Heating Timestamp.`);
-            this.desiredTemperature = this.settings.automaticFallBackTemperatur;
-            return;
-        }
-        if (this._desiredTemperatur !== setting.temperature) {
-            this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${setting.temperature}°C`);
-            this.desiredTemperature = setting.temperature;
+        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;
+        if (this._desiredTemperatur !== targetTemperature) {
+            this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${targetTemperature}°C`);
+            this.desiredTemperature = targetTemperature;
         }
     }
     stopAutomaticCheck() {

package/lib/server/services/ac/ac-device.d.ts

@@ -13,6 +13,7 @@ export declare abstract class AcDevice implements iExcessEnergyConsumer, iRoomDe
     deviceCapabilities: DeviceCapability[];
     readonly blockAutomationHandler: BlockAutomaticHandler;
     protected _activatedByExcessEnergy: boolean;
+    protected _desiredTemperatur: number;
     protected _info: DeviceInfo;
     protected _room: RoomBase | undefined;
     protected _mode: AcMode;

package/lib/server/services/ac/ac-device.js

@@ -43,6 +43,7 @@ class AcDevice {
         this.settings = new models_1.AcSettings();
         this.deviceCapabilities = [DeviceCapability_1.DeviceCapability.ac, DeviceCapability_1.DeviceCapability.blockAutomatic];
         this._activatedByExcessEnergy = false;
+        this._desiredTemperatur = devices_1.UNDEFINED_TEMP_VALUE;
         this._mode = ac_mode_1.AcMode.Off;
         this._movementCallbackAdded = false;
         this._roomTemperature = 0;
@@ -96,8 +97,9 @@ class AcDevice {
         return this.calculateDesiredMode() !== ac_mode_1.AcMode.Off;
     }
     calculateDesiredMode() {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const acOn = this.on;
+        this._desiredTemperatur = (_c = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup) === null || _b === void 0 ? void 0 : _b.desiredTemp) !== null && _c !== void 0 ? _c : 0;
         if (this.settings.manualDisabled) {
             acOn && this.log(models_1.LogLevel.Info, `We should turn off now, as manual disable force is set.`);
             return ac_mode_1.AcMode.Off;
@@ -107,7 +109,7 @@ class AcDevice {
             acOn && this.log(models_1.LogLevel.Info, `We should turn off now, to respect night settings.`);
             return ac_mode_1.AcMode.Off;
         }
-        const heatGroup = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup;
+        const heatGroup = (_d = this.room) === null || _d === void 0 ? void 0 : _d.HeatGroup;
         if (this.settings.useOwnTemperatureAndAutomatic) {
             // Device is in automatic mode so ignore energy and room temperature
             if ((heatGroup === null || heatGroup === void 0 ? void 0 : heatGroup.settings.automaticMode) === false) {
@@ -116,14 +118,11 @@ class AcDevice {
             if (settings_service_1.SettingsService.heatMode !== config_1.HeatingMode.Sommer && this.settings.heatingAllowed) {
                 return ac_mode_1.AcMode.Heating;
             }
-            if (!this.settings.noCoolingOnMovement || ((_c = (_b = this.room) === null || _b === void 0 ? void 0 : _b.PraesenzGroup) === null || _c === void 0 ? void 0 : _c.anyPresent()) !== true) {
+            if (!this.settings.noCoolingOnMovement || ((_f = (_e = this.room) === null || _e === void 0 ? void 0 : _e.PraesenzGroup) === null || _f === void 0 ? void 0 : _f.anyPresent()) !== true) {
                 return ac_mode_1.AcMode.Cooling;
             }
             return ac_mode_1.AcMode.Off;
         }
-        if (this.settings.noCoolingOnMovement && ((_e = (_d = this.room) === null || _d === void 0 ? void 0 : _d.PraesenzGroup) === null || _e === void 0 ? void 0 : _e.anyPresent()) === true) {
-            return ac_mode_1.AcMode.Off;
-        }
         const temp = this.roomTemperature;
         if (temp === undefined || temp === devices_1.UNDEFINED_TEMP_VALUE) {
             this.log(models_1.LogLevel.Warn, `Can't calculate AC Mode as we have no room temperature`);
@@ -136,17 +135,20 @@ class AcDevice {
         let threshold = acOn ? 0.5 : 1.5;
         let thresholdHeating = acOn ? 0.5 : 1.5;
         let desiredMode = ac_mode_1.AcMode.Off;
-        const excessEnergy = (_g = (_f = devices_1.Devices.energymanager) === null || _f === void 0 ? void 0 : _f.excessEnergy) !== null && _g !== void 0 ? _g : -1;
+        const excessEnergy = (_h = (_g = devices_1.Devices.energymanager) === null || _g === void 0 ? void 0 : _g.excessEnergy) !== null && _h !== void 0 ? _h : -1;
         if ((acOn ? 200 : 1000) < excessEnergy) {
             // As there is plenty of energy to spare we plan to overshoot the target by 1 degree
             threshold = -0.5;
             thresholdHeating = -0.5;
         }
-        const targetTemp = heatGroup.getTargetTemperature();
+        const targetTemp = heatGroup.desiredTemp;
         const coolUntil = targetTemp + threshold;
         const heatUntil = targetTemp - thresholdHeating;
         if (temp > coolUntil && settings_service_1.SettingsService.heatMode === config_1.HeatingMode.Sommer) {
             desiredMode = ac_mode_1.AcMode.Cooling;
+            if (this.settings.noCoolingOnMovement && ((_k = (_j = this.room) === null || _j === void 0 ? void 0 : _j.PraesenzGroup) === null || _k === void 0 ? void 0 : _k.anyPresent()) === true) {
+                return ac_mode_1.AcMode.Off;
+            }
         }
         else if (temp < heatUntil && this.settings.heatingAllowed && settings_service_1.SettingsService.heatMode === config_1.HeatingMode.Winter) {
             desiredMode = ac_mode_1.AcMode.Heating;

package/lib/server/services/ac/own-daikin-device.js

@@ -81,8 +81,8 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
         });
     }
     setDesiredInfo(retry = false, forceTemp) {
-        var _a, _b, _c, _d;
-        let targetTemp = (_c = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup) === null || _b === void 0 ? void 0 : _b.getTargetTemperature()) !== null && _c !== void 0 ? _c : 21;
+        var _a;
+        let targetTemp = this._desiredTemperatur;
         if (this.desiredMode == daikin_controller_1.Mode.HOT) {
             targetTemp = this.settings.useOwnTemperatureAndAutomatic ? targetTemp + 1 : 29;
         }
@@ -95,7 +95,7 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
             targetHumidity: this.desiredHum,
             targetTemperature: forceTemp !== null && forceTemp !== void 0 ? forceTemp : targetTemp,
         };
-        (_d = this.device) === null || _d === void 0 ? void 0 : _d.setACControlInfo(changeObject, (err, res) => {
+        (_a = this.device) === null || _a === void 0 ? void 0 : _a.setACControlInfo(changeObject, (err, res) => {
             var _a;
             if (err !== null) {
                 log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Setting Ac Info for ${this.name} failed:  ${err} `);