hoffmation-base 3.2.18 → 3.2.21

package/lib/devices/dachs/dachs.js

@@ -204,7 +204,7 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
         if (!shouldDachsBeStarted) {
             return;
         }
-        const setStateCommand = new command_1.ActuatorSetStateCommand(action, true, 'Energy Level of battery dropped to critical level', new command_1.BlockAutomaticCommand(action, 5 * 60 * 1000, 'Dachs is starting/on', enums_1.CollisionSolving.overrideIfGreater, false));
+        const setStateCommand = new command_1.ActuatorSetStateCommand(action, true, 'Energy Level of battery dropped to critical level', new command_1.BlockAutomaticCommand(action, 15 * 60 * 1000, 'Dachs is starting/on', enums_1.CollisionSolving.overrideIfGreater, false));
         setStateCommand.overrideCommandSource = enums_1.CommandSource.Automatic;
         this.setActuator(setStateCommand);
     }
@@ -242,6 +242,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';

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

@@ -57,6 +57,10 @@ 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.
      */

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

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

package/lib/settingsObjects/deviceSettings/dachsSettings.js

@@ -29,12 +29,14 @@ class DachsDeviceSettings extends actuatorSettings_1.ActuatorSettings {
         /** @inheritDoc */
         this.warmWaterDesiredMinTemp = 45;
         /** @inheritDoc */
+        this.warmWaterDesiredMaxTemp = 75;
+        /** @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;
         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 +51,10 @@ 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.winterMinimumHeatStorageTemp = (_o = data.winterMinimumHeatStorageTemp) !== null && _o !== void 0 ? _o : this.winterMinimumHeatStorageTemp;
         this.winterMinimumPreNightHeatStorageTemp =
-            (_o = data.winterMinimumPreNightHeatStorageTemp) !== null && _o !== void 0 ? _o : this.winterMinimumPreNightHeatStorageTemp;
+            (_p = data.winterMinimumPreNightHeatStorageTemp) !== null && _p !== void 0 ? _p : this.winterMinimumPreNightHeatStorageTemp;
         super.fromPartialObject(data);
     }
     toJSON() {