hoffmation-base 3.2.16 → 3.2.18

package/lib/devices/dachs/dachs.js

@@ -145,7 +145,8 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
         if (!c.on ||
             !this.warmWaterPump ||
             (this.queuedValue === false && !this._dachsOn) ||
-            this.heatStorageTempSensor.temperatureSensor.temperature < this.warmWaterSensor.temperatureSensor.temperature) {
+            this.heatStorageTempSensor.temperatureSensor.temperature < this.warmWaterSensor.temperatureSensor.temperature ||
+            this.warmWaterSensor.temperatureSensor.temperature > 70) {
             return;
         }
         const startPumpCommand = new command_1.ActuatorSetStateCommand(c, true, 'Dachs is starting/on');
@@ -203,8 +204,8 @@ 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', null);
-        setStateCommand.overrideCommandSource = enums_1.CommandSource.Force;
+        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));
+        setStateCommand.overrideCommandSource = enums_1.CommandSource.Automatic;
         this.setActuator(setStateCommand);
     }
     onHeatStorageTempChange(action) {
@@ -352,7 +353,7 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
             // It is not daylight but battery level is high enough
             return false;
         }
-        return true;
+        return !this.settings.blockAutomaticSettings;
     }
     checkAlternativeActuator(shouldDachsBeStarted, action) {
         var _a, _b;