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

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 */
@@ -84,4 +88,6 @@ export declare class Dachs implements iBaseDevice, iActuator {
     private onBatteryLevelChange;
     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,6 +159,10 @@ 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);
+        }
     }
     /** @inheritDoc */
     toggleActuator(c) {
@@ -198,35 +203,10 @@ class Dachs {
      * @param {BatteryLevelChangeAction} action - The action containing the new level
      */
     onBatteryLevelChange(action) {
+        const shouldDachsBeStarted = this.shouldDachsBeStarted(action);
         this.checkHeatingRod(action);
-        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);
-                blockAction.overrideCommandSource = models_1.CommandSource.Force;
-                this.blockDachsStart.setActuator(blockAction);
-                return;
-            }
-            else if (action.newLevel < this.settings.batteryLevelAllowStartThreshold) {
-                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 (this.blockDachsStart.actuatorOn) {
-                // We haven't reached the lower threshold yet --> nothing to do
-                return;
-            }
-        }
-        if (this._dachsOn) {
-            // We are already running
-            return;
-        }
-        const dayType = services_1.TimeCallbackService.dayType(new services_1.SunTimeOffsets());
-        if ((dayType === models_1.TimeOfDay.Daylight || dayType === models_1.TimeOfDay.BeforeSunrise) &&
-            action.newLevel > this.settings.batteryLevelTurnOnThreshold) {
-            // It is daytime (maybe solar power) and it is no critical battery level
-            return;
-        }
-        if (action.newLevel > this.settings.batteryLevelBeforeNightTurnOnThreshold) {
-            // It is not daylight but battery level is high enough
+        this.checkAlternativeActuator(shouldDachsBeStarted, action);
+        if (!shouldDachsBeStarted) {
             return;
         }
         const setStateCommand = new models_1.ActuatorSetStateCommand(action, true, 'Energy Level of battery dropped to critical level', null);
@@ -234,39 +214,52 @@ class Dachs {
         this.setActuator(setStateCommand);
     }
     onTempChange(action) {
+        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 (wwTemp > this.settings.warmWaterDesiredMinTemp + 3) {
-            desiredState = false;
-            reason = `Temperature of warm water pump ${wwTemp}°C is above desired minimum temperature ${this.settings.warmWaterDesiredMinTemp}°C`;
+        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 (((_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) {
+            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) {
@@ -280,5 +273,60 @@ class Dachs {
         const setAction = new models_1.ActuatorSetStateCommand(action, !shouldBeOff, `Battery reached ${action.newLevel}%, heating rod should be turned ${shouldBeOff ? 'off' : 'on'}`, null);
         this.heatingRod.setActuator(setAction);
     }
+    shouldDachsBeStarted(action) {
+        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);
+                blockAction.overrideCommandSource = models_1.CommandSource.Force;
+                this.blockDachsStart.setActuator(blockAction);
+                return false;
+            }
+            else if (action.newLevel < this.settings.batteryLevelAllowStartThreshold) {
+                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 (this.blockDachsStart.actuatorOn) {
+                // We haven't reached the lower threshold yet --> nothing to do
+                return false;
+            }
+        }
+        if (this._dachsOn) {
+            // We are already running
+            return false;
+        }
+        const dayType = services_1.TimeCallbackService.dayType(new services_1.SunTimeOffsets());
+        if ((dayType === models_1.TimeOfDay.Daylight || dayType === models_1.TimeOfDay.BeforeSunrise) &&
+            action.newLevel > this.settings.batteryLevelTurnOnThreshold) {
+            // It is daytime (maybe solar power) and it is no critical battery level
+            return false;
+        }
+        if (action.newLevel > this.settings.batteryLevelBeforeNightTurnOnThreshold) {
+            // It is not daylight but battery level is high enough
+            return false;
+        }
+        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;