hoffmation-base 3.2.20 → 3.2.22

package/lib/devices/dachs/dachs.js

@@ -141,12 +141,15 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
     }
     /** @inheritDoc */
     setActuator(c) {
+        var _a;
         sharedFunctions_1.LampUtils.setActuator(this, c);
         if (!c.on ||
             !this.warmWaterPump ||
             (this.queuedValue === false && !this._dachsOn) ||
+            this.settings.disableDachsOwnWW ||
+            ((_a = this.warmWaterDachsAlternativeActuator) === null || _a === void 0 ? void 0 : _a.actuatorOn) ||
             this.heatStorageTempSensor.temperatureSensor.temperature < this.warmWaterSensor.temperatureSensor.temperature ||
-            this.warmWaterSensor.temperatureSensor.temperature > 70) {
+            this.warmWaterSensor.temperatureSensor.temperature > this.settings.warmWaterDesiredMaxTemp) {
             return;
         }
         const startPumpCommand = new command_1.ActuatorSetStateCommand(c, true, 'Dachs is starting/on');
@@ -242,6 +245,10 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
             desiredWwPumpState = false;
             reason = `Temperature of warm water pump ${wwTemp}°C is higher than temperature of heat storage ${heatStorageTemp}°C`;
         }
+        else if (wwTemp > this.settings.warmWaterDesiredMaxTemp) {
+            desiredWwPumpState = false;
+            reason = `Temperature of warm water pump ${wwTemp}°C is higher than the desired max value`;
+        }
         else if (this._dachsOn) {
             desiredWwPumpState = true;
             reason = 'Dachs is on anyways';
@@ -344,6 +351,10 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
             // It is winter and heat storage is kinda cold --> Start
             return true;
         }
+        else if (this.heatStorageTempSensor.temperatureSensor.temperature > this.settings.heatStorageMaxStartTemp) {
+            // Heat Storage is already quite full, don't start
+            return false;
+        }
         if ((dayType === enums_1.TimeOfDay.Daylight || dayType === enums_1.TimeOfDay.BeforeSunrise) &&
             batteryLevel > this.settings.batteryLevelTurnOnThreshold) {
             // It is daytime (maybe solar power) and it is no critical battery level

package/lib/interfaces/deviceSettings/iDachsDeviceSettings.d.ts

@@ -57,10 +57,18 @@ export interface iDachsDeviceSettings extends iActuatorSettings {
      * Defines the desired minimum temperature for warm water.
      */
     warmWaterDesiredMinTemp: number;
+    /**
+     * Defines the desired maximum temperature for warm water using dachs.
+     */
+    warmWaterDesiredMaxTemp: number;
     /**
      * Defines the desired minimum temperature for heat storage during winter.
      */
     winterMinimumHeatStorageTemp: number;
+    /**
+     * Defines the maximum temperature for heat storage at start requests.
+     */
+    heatStorageMaxStartTemp: number;
     /**
      * Defines the desired minimum temperature for heat storage during winter.
      */

package/lib/settingsObjects/deviceSettings/dachsSettings.d.ts

@@ -24,6 +24,10 @@ export declare class DachsDeviceSettings extends ActuatorSettings implements iDa
     /** @inheritDoc */
     warmWaterDesiredMinTemp: number;
     /** @inheritDoc */
+    warmWaterDesiredMaxTemp: number;
+    /** @inheritDoc */
+    heatStorageMaxStartTemp: number;
+    /** @inheritDoc */
     winterMinimumHeatStorageTemp: number;
     /** @inheritDoc */
     winterMinimumPreNightHeatStorageTemp: number;

package/lib/settingsObjects/deviceSettings/dachsSettings.js

@@ -29,12 +29,16 @@ class DachsDeviceSettings extends actuatorSettings_1.ActuatorSettings {
         /** @inheritDoc */
         this.warmWaterDesiredMinTemp = 45;
         /** @inheritDoc */
+        this.warmWaterDesiredMaxTemp = 75;
+        /** @inheritDoc */
+        this.heatStorageMaxStartTemp = 70;
+        /** @inheritDoc */
         this.winterMinimumHeatStorageTemp = 55;
         /** @inheritDoc */
         this.winterMinimumPreNightHeatStorageTemp = 65;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         this.disableHeatingRod = (_a = data.disableHeatingRod) !== null && _a !== void 0 ? _a : this.disableHeatingRod;
         this.disableDachsOwnWW = (_b = data.disableDachsOwnWW) !== null && _b !== void 0 ? _b : this.disableDachsOwnWW;
         this.disableDachsTemporarily = (_c = data.disableDachsTemporarily) !== null && _c !== void 0 ? _c : this.disableDachsTemporarily;
@@ -49,9 +53,11 @@ class DachsDeviceSettings extends actuatorSettings_1.ActuatorSettings {
             (_j = data.batteryLevelPreventStartAtNightThreshold) !== null && _j !== void 0 ? _j : this.batteryLevelPreventStartAtNightThreshold;
         this.batteryLevelAllowStartThreshold = (_k = data.batteryLevelAllowStartThreshold) !== null && _k !== void 0 ? _k : this.batteryLevelAllowStartThreshold;
         this.warmWaterDesiredMinTemp = (_l = data.warmWaterDesiredMinTemp) !== null && _l !== void 0 ? _l : this.warmWaterDesiredMinTemp;
-        this.winterMinimumHeatStorageTemp = (_m = data.winterMinimumHeatStorageTemp) !== null && _m !== void 0 ? _m : this.winterMinimumHeatStorageTemp;
+        this.warmWaterDesiredMaxTemp = (_m = data.warmWaterDesiredMaxTemp) !== null && _m !== void 0 ? _m : this.warmWaterDesiredMaxTemp;
+        this.heatStorageMaxStartTemp = (_o = data.heatStorageMaxStartTemp) !== null && _o !== void 0 ? _o : this.heatStorageMaxStartTemp;
+        this.winterMinimumHeatStorageTemp = (_p = data.winterMinimumHeatStorageTemp) !== null && _p !== void 0 ? _p : this.winterMinimumHeatStorageTemp;
         this.winterMinimumPreNightHeatStorageTemp =
-            (_o = data.winterMinimumPreNightHeatStorageTemp) !== null && _o !== void 0 ? _o : this.winterMinimumPreNightHeatStorageTemp;
+            (_q = data.winterMinimumPreNightHeatStorageTemp) !== null && _q !== void 0 ? _q : this.winterMinimumPreNightHeatStorageTemp;
         super.fromPartialObject(data);
     }
     toJSON() {