hoffmation-base 3.2.15 → 3.2.17

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, 60000, 'Dachs is starting/on', enums_1.CollisionSolving.overrideIfGreater, false));
+        setStateCommand.overrideCommandSource = enums_1.CommandSource.Automatic;
         this.setActuator(setStateCommand);
     }
     onHeatStorageTempChange(action) {
@@ -225,7 +226,11 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
         const heatStorageTemp = this._tempHeatStorage;
         let desiredWwPumpState = false;
         let reason = '';
-        if (this.settings.disableDachsOwnWW) {
+        if (this.settings.disableDachsTemporarily) {
+            reason = 'Dachs itself is disabled temporarily';
+            desiredWwPumpState = false;
+        }
+        else if (this.settings.disableDachsOwnWW) {
             desiredWwPumpState = false;
             reason = 'Dachs own WW is disabled';
         }
@@ -287,7 +292,14 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
         var _a, _b, _c;
         const dayType = services_1.TimeCallbackService.dayType(new models_1.SunTimeOffsets());
         if (this.blockDachsStart !== undefined) {
-            if ((dayType === enums_1.TimeOfDay.Daylight || dayType === enums_1.TimeOfDay.BeforeSunrise) &&
+            if (this.settings.disableDachsTemporarily) {
+                const blockAction = new command_1.ActuatorSetStateCommand(action, true, `Dachs is disabled temporarily`, null);
+                blockAction.overrideCommandSource = enums_1.CommandSource.Force;
+                this.blockDachsStart.setActuator(blockAction);
+                this._blockStarted = utils_1.Utils.nowMS();
+                return false;
+            }
+            else if ((dayType === enums_1.TimeOfDay.Daylight || dayType === enums_1.TimeOfDay.BeforeSunrise) &&
                 batteryLevel > this.settings.batteryLevelPreventStartThreshold) {
                 const blockAction = new command_1.ActuatorSetStateCommand(action, true, `Battery reached ${batteryLevel}%, Dachs should not run any more`, null);
                 blockAction.overrideCommandSource = enums_1.CommandSource.Force;
@@ -341,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;
@@ -350,7 +362,11 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
         }
         let desiredState = false;
         let reason = 'Dachs is allowed to run --> Block alternative heating source';
-        if (this.settings.disableDachsOwnWW) {
+        if (this.settings.disableDachsTemporarily) {
+            reason = 'Dachs itself is disabled temporarily';
+            desiredState = true;
+        }
+        else if (this.settings.disableDachsOwnWW) {
             reason = 'Dachs own WW is disabled';
             desiredState = true;
         }

package/lib/devices/groups/windowGroup.js

@@ -147,6 +147,7 @@ class WindowGroup extends base_group_1.BaseGroup {
             }
             shutter.baseAutomaticLevel = 0;
             w.setDesiredPosition(new command_1.WindowSetDesiredPositionCommand(c, 0));
+            shutter.lastAutomaticDownTime = utils_1.Utils.nowMS();
         });
         const room = this.getRoom();
         room.setLightTimeBased(new command_1.RoomSetLightTimeBasedCommand(c, true, 'sunsetDown'));

package/lib/devices/hmIPDevices/hmIpRoll.d.ts

@@ -15,6 +15,8 @@ export declare class HmIpRoll extends HmIPDevice implements iShutter {
     blockAutomationHandler: BlockAutomaticHandler;
     /** @inheritDoc */
     baseAutomaticLevel: number;
+    /** @inheritDoc */
+    lastAutomaticDownTime: number;
     private _setLevelSwitchID;
     private _setLevel;
     private _setLevelTime;

package/lib/devices/hmIPDevices/hmIpRoll.js

@@ -21,6 +21,8 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
         this.targetAutomaticValue = 0;
         /** @inheritDoc */
         this.baseAutomaticLevel = 0;
+        /** @inheritDoc */
+        this.lastAutomaticDownTime = 0;
         this._setLevel = -1;
         this._setLevelTime = -1;
         this._currentLevel = -1;

package/lib/devices/sharedFunctions/shutterUtils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShutterUtils = void 0;
 const enums_1 = require("../../enums");
-const services_1 = require("../../services");
+const utils_1 = require("../../utils");
 class ShutterUtils {
     /**
      * Handles setting the shutter level with all checks (block automation, window open, etc)
@@ -12,7 +12,8 @@ class ShutterUtils {
     static setLevel(device, c) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         if (!c.isForceAction) {
-            // Set the target automatic value
+            // Only automatic commands should update the target automatic value
+            // Manual/Force commands should not override the automatic target
             device.targetAutomaticValue = c.level;
         }
         // Respect block automation
@@ -22,10 +23,11 @@ class ShutterUtils {
         }
         if (c.isManual &&
             c.level > 0 &&
+            !utils_1.Utils.isToday(device.lastAutomaticDownTime) &&
             device.baseAutomaticLevel === 0 &&
             !((_b = (_a = device.room) === null || _a === void 0 ? void 0 : _a.settings) === null || _b === void 0 ? void 0 : _b.sonnenAufgangRollos) &&
             ((_d = (_c = device.room) === null || _c === void 0 ? void 0 : _c.settings) === null || _d === void 0 ? void 0 : _d.rolloOffset) &&
-            ![enums_1.TimeOfDay.Night, enums_1.TimeOfDay.AfterSunset].includes(services_1.TimeCallbackService.dayType(device.room.settings.rolloOffset))) {
+            utils_1.Utils.timeWithinBorders(6, 0, 20, 0, new Date())) {
             // First manual up command of the day on a window with no automatic up.
             device.baseAutomaticLevel = 100;
             device.targetAutomaticValue = 100;
@@ -35,8 +37,8 @@ class ShutterUtils {
             device.baseAutomaticLevel === 100 &&
             !((_f = (_e = device.room) === null || _e === void 0 ? void 0 : _e.settings) === null || _f === void 0 ? void 0 : _f.sonnenUntergangRollos) &&
             ((_h = (_g = device.room) === null || _g === void 0 ? void 0 : _g.settings) === null || _h === void 0 ? void 0 : _h.rolloOffset) &&
-            [enums_1.TimeOfDay.Night, enums_1.TimeOfDay.AfterSunset].includes(services_1.TimeCallbackService.dayType(device.room.settings.rolloOffset))) {
-            // First manual down command of the day on a window with no automatic up.
+            (utils_1.Utils.timeWithinBorders(0, 0, 2, 0) || utils_1.Utils.timeWithinBorders(16, 0, 24, 0))) {
+            // First manual down command of the day on a window with no automatic down.
             device.baseAutomaticLevel = 0;
             device.targetAutomaticValue = 0;
         }

package/lib/devices/velux/veluxShutter.d.ts

@@ -14,6 +14,8 @@ export declare class VeluxShutter extends VeluxDevice implements iShutter, iTemp
     targetAutomaticValue: number;
     /** @inheritDoc */
     baseAutomaticLevel: number;
+    /** @inheritDoc */
+    lastAutomaticDownTime: number;
     private _setLevel;
     private _setLevelTime;
     private _currentLevel;

package/lib/devices/velux/veluxShutter.js

@@ -21,6 +21,8 @@ class VeluxShutter extends veluxDevice_1.VeluxDevice {
         this.targetAutomaticValue = 0;
         /** @inheritDoc */
         this.baseAutomaticLevel = 0;
+        /** @inheritDoc */
+        this.lastAutomaticDownTime = 0;
         this._setLevel = -1;
         this._setLevelTime = -1;
         this._currentLevel = -1;

package/lib/devices/zigbee/BaseDevices/zigbeeShutter.d.ts

@@ -23,6 +23,8 @@ export declare class ZigbeeShutter extends ZigbeeDevice implements iShutter {
     targetAutomaticValue: number;
     /** @inheritDoc */
     baseAutomaticLevel: number;
+    /** @inheritDoc */
+    lastAutomaticDownTime: number;
     constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
     /** @inheritDoc */
     get currentLevel(): number;

package/lib/devices/zigbee/BaseDevices/zigbeeShutter.js

@@ -27,6 +27,8 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
         this.targetAutomaticValue = 0;
         /** @inheritDoc */
         this.baseAutomaticLevel = 0;
+        /** @inheritDoc */
+        this.lastAutomaticDownTime = 0;
         this.deviceCapabilities.push(enums_1.DeviceCapability.shutter);
         this.deviceCapabilities.push(enums_1.DeviceCapability.blockAutomatic);
         this.jsonOmitKeys.push('_window');

package/lib/interfaces/baseDevices/iShutter.d.ts

@@ -37,6 +37,10 @@ export interface iShutter extends iRoomDevice, iTemporaryDisableAutomatic {
      * The base automation level (e.g., 0 = closed at night, 100 = open at day)
      */
     baseAutomaticLevel: number;
+    /**
+     * The last time the shutter was automatically closed
+     */
+    lastAutomaticDownTime: number;
     /**
      * Persists the current information of the shutter to the database
      */

package/lib/interfaces/deviceSettings/iDachsDeviceSettings.d.ts

@@ -15,6 +15,10 @@ export interface iDachsDeviceSettings extends iActuatorSettings {
      * Option to disable Warm-Water production from dachs completely.
      */
     disableDachsOwnWW: boolean;
+    /**
+     * Option to disable Dachs altogether, e.g. if no additional heat should be produced during summer times.
+     */
+    disableDachsTemporarily: boolean;
     /**
      * Defines the battery level at which the dachs should be turned on,
      * to prevent a battery based island-system to be out of power.

package/lib/interfaces/settings/iExcessEnergyConsumerSettings.d.ts

@@ -14,6 +14,10 @@ export interface iExcessEnergyConsumerSettings {
      *
      */
     powerReactionTime: number;
+    /**
+     * Option to run the device even if it is not in the excess energy consumer group
+     */
+    runAnyways: boolean;
     /**
      *
      */

package/lib/services/ac/ac-device.js

@@ -146,7 +146,7 @@ class AcDevice extends devices_1.RoomBaseDevice {
             }
             return enums_1.AcMode.Off;
         }
-        if ((_b = devices_1.Devices.energymanager) === null || _b === void 0 ? void 0 : _b.acBlocked) {
+        if (((_b = devices_1.Devices.energymanager) === null || _b === void 0 ? void 0 : _b.acBlocked) && !this.settings.energySettings.runAnyways) {
             if (acOn) {
                 this.log(enums_1.LogLevel.Info, 'We should turn off now, as energy-manager demands off.');
             }

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

@@ -8,6 +8,8 @@ export declare class DachsDeviceSettings extends ActuatorSettings implements iDa
     /** @inheritDoc */
     disableDachsOwnWW: boolean;
     /** @inheritDoc */
+    disableDachsTemporarily: boolean;
+    /** @inheritDoc */
     batteryLevelTurnOnThreshold: number;
     /** @inheritDoc */
     batteryLevelBeforeNightTurnOnThreshold: number;

package/lib/settingsObjects/deviceSettings/dachsSettings.js

@@ -13,6 +13,8 @@ class DachsDeviceSettings extends actuatorSettings_1.ActuatorSettings {
         /** @inheritDoc */
         this.disableDachsOwnWW = false;
         /** @inheritDoc */
+        this.disableDachsTemporarily = false;
+        /** @inheritDoc */
         this.batteryLevelTurnOnThreshold = -1;
         /** @inheritDoc */
         this.batteryLevelBeforeNightTurnOnThreshold = -1;
@@ -32,23 +34,24 @@ class DachsDeviceSettings extends actuatorSettings_1.ActuatorSettings {
         this.winterMinimumPreNightHeatStorageTemp = 65;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         this.disableHeatingRod = (_a = data.disableHeatingRod) !== null && _a !== void 0 ? _a : this.disableHeatingRod;
         this.disableDachsOwnWW = (_b = data.disableDachsOwnWW) !== null && _b !== void 0 ? _b : this.disableDachsOwnWW;
-        this.refreshIntervalTime = (_c = data.refreshIntervalTime) !== null && _c !== void 0 ? _c : this.refreshIntervalTime;
+        this.disableDachsTemporarily = (_c = data.disableDachsTemporarily) !== null && _c !== void 0 ? _c : this.disableDachsTemporarily;
+        this.refreshIntervalTime = (_d = data.refreshIntervalTime) !== null && _d !== void 0 ? _d : this.refreshIntervalTime;
         this.batteryLevelBeforeNightTurnOnThreshold =
-            (_d = data.batteryLevelBeforeNightTurnOnThreshold) !== null && _d !== void 0 ? _d : this.batteryLevelBeforeNightTurnOnThreshold;
-        this.batteryLevelTurnOnThreshold = (_e = data.batteryLevelTurnOnThreshold) !== null && _e !== void 0 ? _e : this.batteryLevelTurnOnThreshold;
-        this.batteryLevelHeatingRodThreshold = (_f = data.batteryLevelHeatingRodThreshold) !== null && _f !== void 0 ? _f : this.batteryLevelHeatingRodThreshold;
+            (_e = data.batteryLevelBeforeNightTurnOnThreshold) !== null && _e !== void 0 ? _e : this.batteryLevelBeforeNightTurnOnThreshold;
+        this.batteryLevelTurnOnThreshold = (_f = data.batteryLevelTurnOnThreshold) !== null && _f !== void 0 ? _f : this.batteryLevelTurnOnThreshold;
+        this.batteryLevelHeatingRodThreshold = (_g = data.batteryLevelHeatingRodThreshold) !== null && _g !== void 0 ? _g : this.batteryLevelHeatingRodThreshold;
         this.batteryLevelPreventStartThreshold =
-            (_g = data.batteryLevelPreventStartThreshold) !== null && _g !== void 0 ? _g : this.batteryLevelPreventStartThreshold;
+            (_h = data.batteryLevelPreventStartThreshold) !== null && _h !== void 0 ? _h : this.batteryLevelPreventStartThreshold;
         this.batteryLevelPreventStartAtNightThreshold =
-            (_h = data.batteryLevelPreventStartAtNightThreshold) !== null && _h !== void 0 ? _h : this.batteryLevelPreventStartAtNightThreshold;
-        this.batteryLevelAllowStartThreshold = (_j = data.batteryLevelAllowStartThreshold) !== null && _j !== void 0 ? _j : this.batteryLevelAllowStartThreshold;
-        this.warmWaterDesiredMinTemp = (_k = data.warmWaterDesiredMinTemp) !== null && _k !== void 0 ? _k : this.warmWaterDesiredMinTemp;
-        this.winterMinimumHeatStorageTemp = (_l = data.winterMinimumHeatStorageTemp) !== null && _l !== void 0 ? _l : this.winterMinimumHeatStorageTemp;
+            (_j = data.batteryLevelPreventStartAtNightThreshold) !== null && _j !== void 0 ? _j : this.batteryLevelPreventStartAtNightThreshold;
+        this.batteryLevelAllowStartThreshold = (_k = data.batteryLevelAllowStartThreshold) !== null && _k !== void 0 ? _k : this.batteryLevelAllowStartThreshold;
+        this.warmWaterDesiredMinTemp = (_l = data.warmWaterDesiredMinTemp) !== null && _l !== void 0 ? _l : this.warmWaterDesiredMinTemp;
+        this.winterMinimumHeatStorageTemp = (_m = data.winterMinimumHeatStorageTemp) !== null && _m !== void 0 ? _m : this.winterMinimumHeatStorageTemp;
         this.winterMinimumPreNightHeatStorageTemp =
-            (_m = data.winterMinimumPreNightHeatStorageTemp) !== null && _m !== void 0 ? _m : this.winterMinimumPreNightHeatStorageTemp;
+            (_o = data.winterMinimumPreNightHeatStorageTemp) !== null && _o !== void 0 ? _o : this.winterMinimumPreNightHeatStorageTemp;
         super.fromPartialObject(data);
     }
     toJSON() {

package/lib/settingsObjects/excessEnergyConsumerSettings.d.ts

@@ -8,6 +8,8 @@ export declare class ExcessEnergyConsumerSettings implements iExcessEnergyConsum
     priority: number;
     rampUpOnSpareEnergy: boolean;
     powerReactionTime: number;
+    /** @inheritDoc */
+    runAnyways: boolean;
     constructor(
     /**
      * Priority in comparision to other ExcessEnergyConsumer Devices

package/lib/settingsObjects/excessEnergyConsumerSettings.js

@@ -14,12 +14,15 @@ class ExcessEnergyConsumerSettings {
         this.priority = priority;
         this.rampUpOnSpareEnergy = rampUpOnSpareEnergy;
         this.powerReactionTime = powerReactionTime;
+        /** @inheritDoc */
+        this.runAnyways = false;
     }
     fromPartialObject(obj) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         this.priority = (_a = obj.priority) !== null && _a !== void 0 ? _a : this.priority;
         this.rampUpOnSpareEnergy = (_b = obj.rampUpOnSpareEnergy) !== null && _b !== void 0 ? _b : this.rampUpOnSpareEnergy;
         this.powerReactionTime = (_c = obj.powerReactionTime) !== null && _c !== void 0 ? _c : this.powerReactionTime;
+        this.runAnyways = (_d = obj.runAnyways) !== null && _d !== void 0 ? _d : this.runAnyways;
     }
 }
 exports.ExcessEnergyConsumerSettings = ExcessEnergyConsumerSettings;