hoffmation-base 3.0.0-alpha.95 → 3.0.0-alpha.97

package/lib/server/devices/dachs/dachs.d.ts

@@ -34,6 +34,10 @@ export declare class Dachs implements iBaseDevice, iActuator {
      * An external actuator to prevent the Dachs from starting.
      */
     blockDachsStart?: iActuator;
+    /**
+     * An external actuator controlling some device to heat the warm water while the Dachs is prohibited from starting.
+     */
+    warmWaterDachsAlternativeActuator?: iActuator;
     private readonly client;
     private readonly config;
     /** @inheritDoc */
@@ -85,4 +89,5 @@ export declare class Dachs implements iBaseDevice, iActuator {
     private onTempChange;
     private checkHeatingRod;
     private shouldDachsBeStarted;
+    private checkAlternativeActuator;
 }

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

@@ -107,6 +107,7 @@ class Dachs {
             'warmWaterPump',
             'heatingRod',
             'blockDachsStart',
+            'warmWaterDachsAlternativeActuator',
         ]));
     }
     /** @inheritDoc */
@@ -158,10 +159,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) {
@@ -204,6 +209,7 @@ class Dachs {
     onBatteryLevelChange(action) {
         const shouldDachsBeStarted = this.shouldDachsBeStarted(action);
         this.checkHeatingRod(action);
+        this.checkAlternativeActuator(shouldDachsBeStarted, action);
         if (!shouldDachsBeStarted) {
             return;
         }
@@ -212,48 +218,52 @@ class Dachs {
         this.setActuator(setStateCommand);
     }
     onTempChange(action) {
-        var _a;
+        var _a, _b;
         if (this.warmWaterPump === undefined) {
             // We have no control over the warm water pump --> nothing to do
             return;
         }
         const wwTemp = this._tempWarmWater;
         const heatStorageTemp = this._tempHeatStorage;
-        let desiredState = false;
+        let desiredWwPumpState = false;
         let reason = '';
-        if (this._dachsOn) {
-            desiredState = true;
+        if (((_a = this.warmWaterDachsAlternativeActuator) === null || _a === void 0 ? void 0 : _a.actuatorOn) === true) {
+            desiredWwPumpState = false;
+            reason = 'Alternative heating source is on';
+        }
+        else if (this._dachsOn) {
+            desiredWwPumpState = true;
             reason = 'Dachs is on anyways';
         }
         else if (wwTemp > heatStorageTemp) {
-            desiredState = false;
+            desiredWwPumpState = false;
             reason = `Temperature of warm water pump ${wwTemp}°C is higher than temperature of heat storage ${heatStorageTemp}°C`;
         }
-        else if (((_a = this.blockDachsStart) === null || _a === void 0 ? void 0 : _a.actuatorOn) === false) {
-            desiredState = true;
+        else if (((_b = this.blockDachsStart) === null || _b === void 0 ? void 0 : _b.actuatorOn) === false) {
+            desiredWwPumpState = true;
             reason = 'Dachs is not blocked --> lowering storage temp might trigger it.';
         }
         else if (wwTemp > this.settings.warmWaterDesiredMinTemp + 3) {
-            desiredState = false;
+            desiredWwPumpState = false;
             reason = `Temperature of warm water pump ${wwTemp}°C is above desired minimum temperature ${this.settings.warmWaterDesiredMinTemp}°C`;
         }
         else if (heatStorageTemp < this.settings.warmWaterDesiredMinTemp - 4) {
-            desiredState = false;
+            desiredWwPumpState = false;
             reason = `Temperature of heat storage ${heatStorageTemp}°C is too low to heat water.`;
         }
         else if (wwTemp < this.settings.warmWaterDesiredMinTemp) {
-            desiredState = true;
+            desiredWwPumpState = true;
             reason = `Temperature of warm water pump ${wwTemp}°C is lower than desired minimum temperature ${this.settings.warmWaterDesiredMinTemp}°C`;
         }
         else {
             // We are somewhere between states, let's not change anything
             return;
         }
-        if (desiredState === this.warmWaterPump.actuatorOn) {
+        if (desiredWwPumpState === this.warmWaterPump.actuatorOn) {
             // Nothing to do
             return;
         }
-        const setAction = new models_1.ActuatorSetStateCommand(action, desiredState, reason, null);
+        const setAction = new models_1.ActuatorSetStateCommand(action, desiredWwPumpState, reason, null);
         this.warmWaterPump.setActuator(setAction);
     }
     checkHeatingRod(action) {
@@ -300,5 +310,27 @@ class Dachs {
         }
         return true;
     }
+    checkAlternativeActuator(shouldDachsBeStarted, action) {
+        var _a, _b;
+        if (!this.warmWaterDachsAlternativeActuator) {
+            return;
+        }
+        let desiredState = false;
+        let reason = 'Dachs is allowed to run --> Block alternative heating source';
+        if (shouldDachsBeStarted || this._dachsOn) {
+            reason = 'Dachs is running or should be started';
+            desiredState = false;
+        }
+        else if (((_a = this.blockDachsStart) === null || _a === void 0 ? void 0 : _a.actuatorOn) === true || ((_b = this.blockDachsStart) === null || _b === void 0 ? void 0 : _b.queuedValue) === true) {
+            reason = 'Dachs is blocked --> Allow Alternative Heating Source';
+            desiredState = true;
+        }
+        if (this.warmWaterDachsAlternativeActuator.actuatorOn === desiredState) {
+            return;
+        }
+        const command = new models_1.ActuatorSetStateCommand(action, desiredState, reason, null);
+        command.overrideCommandSource = models_1.CommandSource.Force;
+        this.warmWaterDachsAlternativeActuator.setActuator(command);
+    }
 }
 exports.Dachs = Dachs;