hoffmation-base 3.0.0-alpha.96 → 3.0.0-alpha.98

package/lib/server/devices/dachs/dachs.js

@@ -12,6 +12,7 @@ const dachsSettings_1 = require("../../../models/deviceSettings/dachsSettings");
 const lib_1 = require("./lib");
 const dachsTemperatureSensor_1 = require("./dachsTemperatureSensor");
 const blockAutomaticHandler_1 = require("../../services/blockAutomaticHandler");
+const config_1 = require("../../config");
 class Dachs {
     /** @inheritDoc */
     get customName() {
@@ -159,10 +160,14 @@ class Dachs {
     /** @inheritDoc */
     setActuator(c) {
         devices_1.LampUtils.setActuator(this, c);
-        if (c.on && this.warmWaterPump && (this.queuedValue === true || this._dachsOn)) {
-            const startPumpCommand = new models_1.ActuatorSetStateCommand(c, true, 'Dachs is starting/on');
-            this.warmWaterPump.setActuator(startPumpCommand);
+        if (!c.on ||
+            !this.warmWaterPump ||
+            (this.queuedValue === false && !this._dachsOn) ||
+            this.heatStorageTempSensor.temperatureSensor.temperature < this.warmWaterSensor.temperatureSensor.temperature) {
+            return;
         }
+        const startPumpCommand = new models_1.ActuatorSetStateCommand(c, true, 'Dachs is starting/on');
+        this.warmWaterPump.setActuator(startPumpCommand);
     }
     /** @inheritDoc */
     toggleActuator(c) {
@@ -274,6 +279,7 @@ class Dachs {
         this.heatingRod.setActuator(setAction);
     }
     shouldDachsBeStarted(action) {
+        var _a;
         if (this.blockDachsStart !== undefined) {
             if (action.newLevel > this.settings.batteryLevelPreventStartThreshold) {
                 const blockAction = new models_1.ActuatorSetStateCommand(action, true, `Battery reached ${action.newLevel}%, Dachs should not run any more`, null);
@@ -285,6 +291,12 @@ class Dachs {
                 const liftAction = new models_1.ActuatorSetStateCommand(action, false, `Battery reached ${action.newLevel}%, Dachs is now allowed to run if needed`, null);
                 this.blockDachsStart.setActuator(liftAction);
             }
+            else if (((_a = services_1.SettingsService.settings.heaterSettings) === null || _a === void 0 ? void 0 : _a.mode) === config_1.HeatingMode.Winter &&
+                this.heatStorageTempSensor.temperatureSensor.temperature < 60 &&
+                services_1.Utils.dateByTimeSpan(21, 30) < new Date()) {
+                const liftWinterAction = new models_1.ActuatorSetStateCommand(action, false, `Battery at ${action.newLevel}% but it is winter, we are nearing night and heat storage is kinda cold: Dachs is now allowed to run if needed`, null);
+                this.blockDachsStart.setActuator(liftWinterAction);
+            }
             else if (this.blockDachsStart.actuatorOn) {
                 // We haven't reached the lower threshold yet --> nothing to do
                 return false;