hoffmation-base 3.0.0-alpha.54 → 3.0.0-alpha.56

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

@@ -12,6 +12,18 @@ export declare class DachsDeviceSettings extends ActuatorSettings {
      * Uses {@link iBatteryDevice.addBatteryLevelCallback}
      */
     batteryLevelTurnOnThreshold: number;
+    /**
+     * Defines the battery level below which the dachs should be allowed to start
+     */
+    batteryLevelAllowStartThreshold: number;
+    /**
+     * Defines the battery level above which the dachs should be prevented from starting/running.
+     */
+    batteryLevelPreventStartThreshold: number;
+    /**
+     * Defines the desired minimum temperature for warm water.
+     */
+    warmWaterDesiredMinTemp: number;
     fromPartialObject(data: Partial<DachsDeviceSettings>): void;
     protected toJSON(): Partial<DachsDeviceSettings>;
 }

package/lib/models/deviceSettings/dachsSettings.js

@@ -18,11 +18,27 @@ class DachsDeviceSettings extends actuatorSettings_1.ActuatorSettings {
          * Uses {@link iBatteryDevice.addBatteryLevelCallback}
          */
         this.batteryLevelTurnOnThreshold = -1;
+        /**
+         * Defines the battery level below which the dachs should be allowed to start
+         */
+        this.batteryLevelAllowStartThreshold = 50;
+        /**
+         * Defines the battery level above which the dachs should be prevented from starting/running.
+         */
+        this.batteryLevelPreventStartThreshold = 70;
+        /**
+         * Defines the desired minimum temperature for warm water.
+         */
+        this.warmWaterDesiredMinTemp = 45;
     }
     fromPartialObject(data) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         this.refreshInterval = (_a = data.refreshInterval) !== null && _a !== void 0 ? _a : this.refreshInterval;
         this.batteryLevelTurnOnThreshold = (_b = data.batteryLevelTurnOnThreshold) !== null && _b !== void 0 ? _b : this.batteryLevelTurnOnThreshold;
+        this.batteryLevelPreventStartThreshold =
+            (_c = data.batteryLevelPreventStartThreshold) !== null && _c !== void 0 ? _c : this.batteryLevelPreventStartThreshold;
+        this.batteryLevelAllowStartThreshold = (_d = data.batteryLevelAllowStartThreshold) !== null && _d !== void 0 ? _d : this.batteryLevelAllowStartThreshold;
+        this.warmWaterDesiredMinTemp = (_e = data.warmWaterDesiredMinTemp) !== null && _e !== void 0 ? _e : this.warmWaterDesiredMinTemp;
         super.fromPartialObject(data);
     }
     toJSON() {

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

@@ -22,6 +22,14 @@ export declare class Dachs implements iBaseDevice, iActuator {
      * A reference to the Temperature measuring heat storage temperature
      */
     readonly heatStorageTempSensor: DachsTemperatureSensor;
+    /**
+     * An external actuator controlling the warm water pump
+     */
+    readonly warmWaterPump?: iActuator;
+    /**
+     * An external actuator to prevent the Dachs from starting.
+     */
+    readonly blockDachsStart?: iActuator;
     private readonly client;
     private readonly config;
     /** @inheritDoc */
@@ -70,4 +78,5 @@ export declare class Dachs implements iBaseDevice, iActuator {
      * @param {BatteryLevelChangeAction} action - The action containing the new level
      */
     private onBatteryLevelChange;
+    private onTempChange;
 }

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

@@ -62,6 +62,8 @@ class Dachs {
             const energyManager = devices_1.Devices.energymanager;
             energyManager.addBatteryLevelCallback(this.onBatteryLevelChange.bind(this));
         }
+        this.warmWaterSensor.addTempChangeCallback(this.onTempChange.bind(this));
+        this.heatStorageTempSensor.addTempChangeCallback(this.onTempChange.bind(this));
     }
     /** @inheritDoc */
     get info() {
@@ -95,7 +97,16 @@ class Dachs {
     }
     /** @inheritDoc */
     toJSON() {
-        return services_1.Utils.jsonFilter(lodash_1.default.omit(this, ['room', 'client', 'config', '_influxClient', 'warmWaterSensor', 'heatStorageTempSensor']));
+        return services_1.Utils.jsonFilter(lodash_1.default.omit(this, [
+            'room',
+            'client',
+            'config',
+            '_influxClient',
+            'warmWaterSensor',
+            'heatStorageTempSensor',
+            'warmWaterPump',
+            'blockDachsStart',
+        ]));
     }
     /** @inheritDoc */
     persistDeviceInfo() {
@@ -186,7 +197,23 @@ class Dachs {
      * @param {BatteryLevelChangeAction} action - The action containing the new level
      */
     onBatteryLevelChange(action) {
-        if (this._dachsOn || this.settings.batteryLevelTurnOnThreshold < action.newLevel) {
+        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 || this.settings.batteryLevelTurnOnThreshold > action.newLevel) {
             // We are already running, or battery level is high enough.
             return;
         }
@@ -194,5 +221,42 @@ class Dachs {
         setStateCommand.overrideCommandSource = models_1.CommandSource.Force;
         this.setActuator(setStateCommand);
     }
+    onTempChange(action) {
+        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 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`;
+        }
+        else if (wwTemp > heatStorageTemp) {
+            desiredState = false;
+            reason = `Temperature of warm water pump ${wwTemp}°C is higher than temperature of heat storage ${heatStorageTemp}°C`;
+        }
+        else if (heatStorageTemp < this.settings.warmWaterDesiredMinTemp - 4) {
+            desiredState = false;
+            reason = `Temperature of heat storage ${heatStorageTemp}°C is too low to heat water.`;
+        }
+        else if (wwTemp < this.settings.warmWaterDesiredMinTemp) {
+            desiredState = 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) {
+            // Nothing to do
+            return;
+        }
+        const setAction = new models_1.ActuatorSetStateCommand(action, desiredState, reason, null);
+        setAction.overrideCommandSource = models_1.CommandSource.Force;
+        this.warmWaterPump.setActuator(setAction);
+    }
 }
 exports.Dachs = Dachs;

package/lib/server/devices/shelly/index.d.ts

@@ -1,2 +1,3 @@
 export { ShellyDevice } from './shellyDevice';
 export { ShellyTrv } from './shellyTrv';
+export { ShellyActuator } from './shellyActuator';

package/lib/server/devices/shelly/index.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ShellyTrv = exports.ShellyDevice = void 0;
+exports.ShellyActuator = exports.ShellyTrv = exports.ShellyDevice = void 0;
 var shellyDevice_1 = require("./shellyDevice");
 Object.defineProperty(exports, "ShellyDevice", { enumerable: true, get: function () { return shellyDevice_1.ShellyDevice; } });
 var shellyTrv_1 = require("./shellyTrv");
 Object.defineProperty(exports, "ShellyTrv", { enumerable: true, get: function () { return shellyTrv_1.ShellyTrv; } });
+var shellyActuator_1 = require("./shellyActuator");
+Object.defineProperty(exports, "ShellyActuator", { enumerable: true, get: function () { return shellyActuator_1.ShellyActuator; } });