hoffmation-base 3.2.9 → 3.2.10-alpha.1

package/lib/command/ShutterSetLevelCommand.d.ts

@@ -1,11 +1,18 @@
 import { BaseCommand } from './baseCommand';
 import { CommandSource, CommandType } from '../enums';
 import { iBaseCommand } from './iBaseCommand';
+import { BlockAutomaticCommand } from './blockAutomaticCommand';
 export declare class ShutterSetLevelCommand extends BaseCommand {
     readonly level: number;
     readonly skipOpenWarning: boolean;
     /** @inheritDoc */
     type: CommandType;
+    /**
+     * The command to disable automatic actions for a specific duration.
+     * Null = no automatic actions will be disabled.
+     * Undefined = use device or global default
+     */
+    disableAutomaticCommand: BlockAutomaticCommand | null | undefined;
     /**
      * Command to set the level of a shutter
      * @param source - The source of the command

package/lib/devices/groups/Window.d.ts

@@ -9,7 +9,6 @@ export declare class Window extends BaseGroup implements iWindow {
     readonly vibrationIds: string[];
     readonly shutterIds: string[];
     readonly magnetIds: string[];
-    private _desiredPosition;
     /**
      * The desired shutter level for the window
      * @returns {number} The level (0 closed, 100 open)
@@ -33,7 +32,7 @@ export declare class Window extends BaseGroup implements iWindow {
     setDesiredPosition(c: WindowSetDesiredPositionCommand): void;
     getHandle(): iHandle[];
     getMagnetContact(): ZigbeeMagnetContact[];
-    getShutter(): iShutter[];
+    getShutter(): iShutter;
     getVibration(): iVibrationSensor[];
     griffeInPosition(pPosition: WindowPosition): number;
     initialize(): void;

package/lib/devices/groups/Window.js

@@ -13,16 +13,14 @@ class Window extends base_group_1.BaseGroup {
      * @returns {number} The level (0 closed, 100 open)
      */
     get desiredPosition() {
-        return this._desiredPosition;
+        return this.getShutter().baseAutomaticLevel;
     }
     /**
      * Checks if any shutter is down (0%)
      * @returns {boolean} true if any shutter is down
      */
     get anyShutterDown() {
-        return this.getShutter().some((s) => {
-            return s.currentLevel === 0;
-        });
+        return this.getShutter().currentLevel === 0;
     }
     constructor(roomName, handleIds = [], vibrationIds = [], shutterIds = [], magnetIds = []) {
         super(roomName, enums_1.GroupType.Window);
@@ -30,7 +28,6 @@ class Window extends base_group_1.BaseGroup {
         this.vibrationIds = vibrationIds;
         this.shutterIds = shutterIds;
         this.magnetIds = magnetIds;
-        this._desiredPosition = 0;
         this.deviceCluster.deviceMap.set(enums_1.DeviceClusterType.Handle, new device_list_1.DeviceList(handleIds));
         this.deviceCluster.deviceMap.set(enums_1.DeviceClusterType.Vibration, new device_list_1.DeviceList(vibrationIds));
         this.deviceCluster.deviceMap.set(enums_1.DeviceClusterType.Shutter, new device_list_1.DeviceList(shutterIds));
@@ -50,8 +47,11 @@ class Window extends base_group_1.BaseGroup {
      * @param c - The command to execute
      */
     setDesiredPosition(c) {
-        this._desiredPosition = c.position;
-        this.restoreDesiredPosition(new command_1.WindowRestoreDesiredPositionCommand(c));
+        const shutter = this.getShutter();
+        if (!shutter) {
+            return;
+        }
+        shutter.setLevel(new command_1.ShutterSetLevelCommand(c, c.position));
     }
     getHandle() {
         return this.deviceCluster.getDevicesByType(enums_1.DeviceClusterType.Handle);
@@ -60,7 +60,7 @@ class Window extends base_group_1.BaseGroup {
         return this.deviceCluster.getIoBrokerDevicesByType(enums_1.DeviceClusterType.MagnetContact);
     }
     getShutter() {
-        return this.deviceCluster.getDevicesByType(enums_1.DeviceClusterType.Shutter);
+        return this.deviceCluster.getDevicesByType(enums_1.DeviceClusterType.Shutter)[0];
     }
     getVibration() {
         return this.deviceCluster.getDevicesByType(enums_1.DeviceClusterType.Vibration);
@@ -77,6 +77,7 @@ class Window extends base_group_1.BaseGroup {
     initialize() {
         this.getHandle().forEach((griff) => {
             griff.addKippCallback((kipp) => {
+                var _a;
                 if (!(kipp && this.griffeInPosition(enums_1.WindowPosition.open) === 0)) {
                     return;
                 }
@@ -84,14 +85,14 @@ class Window extends base_group_1.BaseGroup {
                     element.vibrationBlockedByHandle = true;
                 });
                 const timeOfDay = services_1.TimeCallbackService.dayType(this.getRoom().settings.rolloOffset);
-                services_1.ShutterService.windowAllToPosition(this, new command_1.ShutterSetLevelCommand(enums_1.CommandSource.Automatic, services_1.TimeCallbackService.darkOutsideOrNight(timeOfDay) ? 50 : 100, 'Window ajar by handle'));
+                (_a = this.getShutter()) === null || _a === void 0 ? void 0 : _a.setLevel(new command_1.ShutterSetLevelCommand(enums_1.CommandSource.Force, services_1.TimeCallbackService.darkOutsideOrNight(timeOfDay) ? 50 : 100, 'Window ajar by handle'));
             });
             griff.addOffenCallback((offen) => {
                 if (offen) {
                     this.getVibration().forEach((element) => {
                         element.vibrationBlockedByHandle = true;
                     });
-                    services_1.ShutterService.windowAllToPosition(this, new command_1.ShutterSetLevelCommand(enums_1.CommandSource.Automatic, 100, 'Window opened by handle'));
+                    this.getShutter().setLevel(new command_1.ShutterSetLevelCommand(enums_1.CommandSource.Force, 100, 'Window opened by handle'));
                     return;
                 }
             });
@@ -113,22 +114,24 @@ class Window extends base_group_1.BaseGroup {
             });
         });
         utils_1.Utils.guardedTimeout(() => {
-            this.getShutter().forEach((shutter) => {
+            const shutter = this.getShutter();
+            if (shutter) {
                 shutter.window = this;
-            });
+            }
             this.getHandle().forEach((g) => {
                 g.window = this;
             });
         }, 5, this);
     }
     rolloPositionChange(action) {
-        this.log(enums_1.LogLevel.Debug, `Rollo Position Change in ${this.roomName}: ${action.reasonTrace}`, action.newPosition == this._desiredPosition ? enums_1.LogDebugType.None : enums_1.LogDebugType.ShutterPositionChange);
+        this.log(enums_1.LogLevel.Debug, `Rollo Position Change in ${this.roomName}: ${action.reasonTrace}`, action.newPosition == this.desiredPosition ? enums_1.LogDebugType.None : enums_1.LogDebugType.ShutterPositionChange);
         if (action.newPosition === 0 || action.newPosition === 100) {
             this.getRoom().setLightTimeBased(new command_1.RoomSetLightTimeBasedCommand(action, true));
         }
     }
     restoreDesiredPosition(c) {
-        services_1.ShutterService.windowAllToPosition(this, new command_1.ShutterSetLevelCommand(c, this._desiredPosition));
+        var _a;
+        (_a = this.getShutter()) === null || _a === void 0 ? void 0 : _a.blockAutomationHandler.liftAutomaticBlock(new command_1.BlockAutomaticLiftBlockCommand(c, 'Window restore desired position', true));
     }
     addHandleChangeCallback(cb) {
         this.getHandle().forEach((griff) => {

package/lib/devices/groups/windowGroup.d.ts

@@ -42,5 +42,6 @@ export declare class WindowGroup extends BaseGroup implements iWindowGroup {
     changeVibrationMotionBlock(block: boolean): void;
     sunsetDown(c: ShutterSunsetDownCommand): void;
     reconfigureSunsetShutterCallback(): void;
+    private setWindowShutterBaseAutomaticLevel;
     reconfigureSunriseShutterCallback(): void;
 }

package/lib/devices/groups/windowGroup.js

@@ -6,7 +6,6 @@ const services_1 = require("../../services");
 const enums_1 = require("../../enums");
 const device_list_1 = require("../device-list");
 const utils_1 = require("../../utils");
-const weather_1 = require("../../services/weather");
 const models_1 = require("../../models");
 const base_group_1 = require("./base-group");
 class WindowGroup extends base_group_1.BaseGroup {
@@ -84,31 +83,33 @@ class WindowGroup extends base_group_1.BaseGroup {
         const timeOfDay = services_1.TimeCallbackService.dayType(room.settings.rolloOffset);
         const darkOutside = services_1.TimeCallbackService.darkOutsideOrNight(timeOfDay);
         this.windows.forEach((f) => {
-            var _a, _b, _c, _d, _e, _f;
-            const shutterSettings = (_b = (_a = f.getShutter()) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.settings;
+            var _a, _b, _c, _d, _e, _f, _g, _h;
+            const shutterSettings = (_a = f.getShutter()) === null || _a === void 0 ? void 0 : _a.settings;
             if (!shutterSettings) {
                 return;
             }
+            const shutter = f.getShutter();
+            if (!shutter || shutter.blockAutomationHandler.automaticBlockActive) {
+                return;
+            }
             if (darkOutside) {
                 f.restoreDesiredPosition(new command_1.WindowRestoreDesiredPositionCommand(c, "It's dark outside."));
                 return;
             }
-            let desiredPos = f.desiredPosition;
-            if (desiredPos > 0) {
-                desiredPos = weather_1.WeatherService.weatherRolloPosition(desiredPos, (_d = (_c = room.HeatGroup) === null || _c === void 0 ? void 0 : _c.desiredTemp) !== null && _d !== void 0 ? _d : -99, (_f = (_e = room.HeatGroup) === null || _e === void 0 ? void 0 : _e.temperature) !== null && _f !== void 0 ? _f : -99, this.log.bind(this), shutterSettings);
-            }
-            if (f.griffeInPosition(enums_1.WindowPosition.open) > 0 && desiredPos < 100) {
+            if (f.griffeInPosition(enums_1.WindowPosition.open) > 0 || f.griffeInPosition(enums_1.WindowPosition.tilted) > 0) {
                 return;
             }
-            if (f.griffeInPosition(enums_1.WindowPosition.tilted) > 0) {
-                desiredPos = Math.max(30, desiredPos);
+            let desiredPos = f.desiredPosition;
+            if (desiredPos > 0) {
+                desiredPos = services_1.WeatherService.weatherRolloPosition((_c = (_b = f.getShutter()) === null || _b === void 0 ? void 0 : _b.baseAutomaticLevel) !== null && _c !== void 0 ? _c : 0, (_e = (_d = room.HeatGroup) === null || _d === void 0 ? void 0 : _d.desiredTemp) !== null && _e !== void 0 ? _e : -99, (_g = (_f = room.HeatGroup) === null || _f === void 0 ? void 0 : _f.temperature) !== null && _g !== void 0 ? _g : -99, this.log.bind(this), shutterSettings);
             }
-            services_1.ShutterService.windowAllToPosition(f, new command_1.ShutterSetLevelCommand(c, desiredPos, '', true));
+            (_h = f.getShutter()) === null || _h === void 0 ? void 0 : _h.setLevel(new command_1.ShutterSetLevelCommand(c, desiredPos, '', true));
         });
     }
     sunriseUp(c) {
+        this.setWindowShutterBaseAutomaticLevel(100);
         this.windows.forEach((w) => {
-            if (!this.getRoom().settings.sonnenAufgangRollos || w.getShutter().length === 0) {
+            if (!this.getRoom().settings.sonnenAufgangRollos || w.getShutter() === undefined) {
                 return;
             }
             w.setDesiredPosition(new command_1.WindowSetDesiredPositionCommand(c, 100));
@@ -139,7 +140,14 @@ class WindowGroup extends base_group_1.BaseGroup {
         });
     }
     sunsetDown(c) {
-        this.setDesiredPosition(new command_1.WindowSetDesiredPositionCommand(c, 0));
+        this.windows.forEach((w) => {
+            const shutter = w.getShutter();
+            if (!shutter) {
+                return;
+            }
+            shutter.baseAutomaticLevel = 0;
+            w.setDesiredPosition(new command_1.WindowSetDesiredPositionCommand(c, 0));
+        });
         const room = this.getRoom();
         room.setLightTimeBased(new command_1.RoomSetLightTimeBasedCommand(c, true, 'sunsetDown'));
     }
@@ -158,7 +166,7 @@ class WindowGroup extends base_group_1.BaseGroup {
             this.sunsetShutterCallback.sunTimeOffset = room.settings.rolloOffset;
             if (room.settings.sonnenUntergangRolloAdditionalOffsetPerCloudiness > 0) {
                 this.sunsetShutterCallback.cloudOffset =
-                    weather_1.WeatherService.getCurrentCloudiness() * room.settings.sonnenUntergangRolloAdditionalOffsetPerCloudiness;
+                    services_1.WeatherService.getCurrentCloudiness() * room.settings.sonnenUntergangRolloAdditionalOffsetPerCloudiness;
             }
             this.sunsetShutterCallback.recalcNextToDo(new Date());
         }
@@ -169,12 +177,22 @@ class WindowGroup extends base_group_1.BaseGroup {
             }, room.settings.rolloOffset.sunset);
             if (services_1.TimeCallbackService.darkOutsideOrNight(services_1.TimeCallbackService.dayType(room.settings.rolloOffset))) {
                 utils_1.Utils.guardedTimeout(() => {
+                    this.setWindowShutterBaseAutomaticLevel(0);
                     this.setDesiredPosition(new command_1.WindowSetDesiredPositionCommand(enums_1.CommandSource.Initial, 0, 'It is dark outside'));
                 }, 60000, this);
             }
             services_1.TimeCallbackService.addCallback(this.sunsetShutterCallback);
         }
     }
+    setWindowShutterBaseAutomaticLevel(level) {
+        this.windows.forEach((f) => {
+            const shutter = f.getShutter();
+            if (!shutter) {
+                return;
+            }
+            shutter.baseAutomaticLevel = level;
+        });
+    }
     reconfigureSunriseShutterCallback() {
         const room = this.getRoom();
         if (!room.settings.sonnenAufgangRollos || !room.settings.rolloOffset) {

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

@@ -2,12 +2,20 @@ import { HmIPDevice } from './hmIpDevice';
 import { iShutter, iWindow } from '../../interfaces';
 import { ShutterSettings } from '../../settingsObjects';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-import { ShutterSetLevelCommand } from '../../command';
+import { RestoreTargetAutomaticValueCommand, ShutterSetLevelCommand } from '../../command';
+import { BlockAutomaticHandler } from '../../services';
 export declare class HmIpRoll extends HmIPDevice implements iShutter {
     /** @inheritDoc */
     settings: ShutterSettings;
+    /** @inheritDoc */
+    firstCommandRecieved: boolean;
+    /** @inheritDoc */
+    targetAutomaticValue: number;
+    /** @inheritDoc */
+    blockAutomationHandler: BlockAutomaticHandler;
+    /** @inheritDoc */
+    baseAutomaticLevel: number;
     private _setLevelSwitchID;
-    private _firstCommandRecieved;
     private _setLevel;
     private _setLevelTime;
     constructor(pInfo: IoBrokerDeviceInfo);
@@ -22,4 +30,6 @@ export declare class HmIpRoll extends HmIPDevice implements iShutter {
     persist(): void;
     private setCurrentLevel;
     setLevel(command: ShutterSetLevelCommand): void;
+    writePositionStateToDevice(pPosition: number): void;
+    restoreTargetAutomaticValue(command: RestoreTargetAutomaticValueCommand): void;
 }

package/lib/devices/hmIPDevices/hmIpRoll.js

@@ -7,19 +7,27 @@ const enums_1 = require("../../enums");
 const command_1 = require("../../command");
 const utils_1 = require("../../utils");
 const action_1 = require("../../action");
+const services_1 = require("../../services");
+const sharedFunctions_1 = require("../sharedFunctions");
 class HmIpRoll extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         var _a;
         super(pInfo, enums_1.DeviceType.HmIpRoll);
         /** @inheritDoc */
         this.settings = new settingsObjects_1.ShutterSettings();
-        this._firstCommandRecieved = false;
+        /** @inheritDoc */
+        this.firstCommandRecieved = false;
+        /** @inheritDoc */
+        this.targetAutomaticValue = 0;
+        /** @inheritDoc */
+        this.baseAutomaticLevel = 0;
         this._setLevel = -1;
         this._setLevelTime = -1;
         this._currentLevel = -1;
         this.jsonOmitKeys.push('_window');
         this.deviceCapabilities.push(enums_1.DeviceCapability.shutter);
         this._setLevelSwitchID = `${this.info.fullID}.4.LEVEL`;
+        this.blockAutomationHandler = new services_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));
         (_a = this.dbo) === null || _a === void 0 ? void 0 : _a.getLastDesiredPosition(this).then((val) => {
             var _a;
             if (val.desiredPosition === -1) {
@@ -76,43 +84,14 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
         this._currentLevel = value;
     }
     setLevel(command) {
-        let targetLevel = command.level;
-        if (!this._firstCommandRecieved && !command.isInitial) {
-            this._firstCommandRecieved = true;
-        }
-        if (this._firstCommandRecieved && command.isInitial) {
-            this.log(enums_1.LogLevel.Debug, `Skipped initial Rollo to ${targetLevel} as we recieved a command already`);
-            return;
-        }
-        if (this.currentLevel === targetLevel && !command.isForceAction) {
-            this.logCommand(command, `Skip Rollo command to Position ${targetLevel} as this is the current one`, enums_1.LogDebugType.SkipUnchangedRolloPosition);
-            return;
-        }
-        if (this._setLevelSwitchID === '') {
-            this.log(enums_1.LogLevel.Error, 'Keine Switch ID bekannt.');
-            return;
-        }
-        if (!this.checkIoConnection(true)) {
-            return;
-        }
-        this.logCommand(command);
-        if (this._window !== undefined) {
-            if (this._window.griffeInPosition(enums_1.WindowPosition.open) > 0 && command.level < 100) {
-                if (!command.skipOpenWarning) {
-                    this.log(enums_1.LogLevel.Alert, 'Not closing the shutter, as the window is open!');
-                }
-                return;
-            }
-            if (this._window.griffeInPosition(enums_1.WindowPosition.tilted) > 0 && targetLevel < 50) {
-                targetLevel = 50;
-                if (!command.skipOpenWarning) {
-                    this.log(enums_1.LogLevel.Alert, 'Not closing the shutter, as the window is half open!');
-                }
-            }
-        }
-        this._setLevel = targetLevel;
-        this.log(enums_1.LogLevel.Debug, `Fahre Rollo auf Position ${targetLevel}`);
-        this.setState(this._setLevelSwitchID, targetLevel);
+        sharedFunctions_1.ShutterUtils.setLevel(this, command);
+    }
+    writePositionStateToDevice(pPosition) {
+        this._setLevel = pPosition;
+        this.setState(this._setLevelSwitchID, pPosition);
+    }
+    restoreTargetAutomaticValue(command) {
+        this.setLevel(new command_1.ShutterSetLevelCommand(command, this.targetAutomaticValue));
     }
 }
 exports.HmIpRoll = HmIpRoll;

package/lib/devices/sharedFunctions/index.d.ts

@@ -2,4 +2,5 @@ export * from './battery';
 export * from './handleSensor';
 export * from './humiditySensor';
 export * from './lampUtils';
+export * from './shutterUtils';
 export * from './temperatureSensor';

package/lib/devices/sharedFunctions/index.js

@@ -18,4 +18,5 @@ __exportStar(require("./battery"), exports);
 __exportStar(require("./handleSensor"), exports);
 __exportStar(require("./humiditySensor"), exports);
 __exportStar(require("./lampUtils"), exports);
+__exportStar(require("./shutterUtils"), exports);
 __exportStar(require("./temperatureSensor"), exports);

package/lib/devices/sharedFunctions/shutterUtils.d.ts

@@ -0,0 +1,10 @@
+import { ShutterSetLevelCommand } from '../../command';
+import { iShutter } from '../../interfaces';
+export declare class ShutterUtils {
+    /**
+     * Handles setting the shutter level with all checks (block automation, window open, etc)
+     * @param device - The shutter
+     * @param c - The command
+     */
+    static setLevel(device: iShutter, c: ShutterSetLevelCommand): void;
+}

package/lib/devices/sharedFunctions/shutterUtils.js

@@ -0,0 +1,79 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ShutterUtils = void 0;
+const enums_1 = require("../../enums");
+const services_1 = require("../../services");
+class ShutterUtils {
+    /**
+     * Handles setting the shutter level with all checks (block automation, window open, etc)
+     * @param device - The shutter
+     * @param c - The command
+     */
+    static setLevel(device, c) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        if (!c.isForceAction) {
+            // Set the target automatic value
+            device.targetAutomaticValue = c.level;
+        }
+        // Respect block automation
+        if (!c.isForceAction && device.blockAutomationHandler.automaticBlockActive) {
+            device.logCommand(c, `Skip shutter command to Position ${c.level} as automation is blocked until ${new Date(device.blockAutomationHandler.automaticBlockedUntil).toLocaleTimeString('de-DE')}`);
+            return;
+        }
+        if (c.isManual &&
+            c.level > 0 &&
+            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))) {
+            // First manual up command of the day on a window with no automatic up.
+            device.baseAutomaticLevel = 100;
+        }
+        else if (c.isManual &&
+            c.level === 0 &&
+            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.
+            device.baseAutomaticLevel = 0;
+        }
+        let pPosition = c.level;
+        if (!device.firstCommandRecieved && !c.isInitial) {
+            device.firstCommandRecieved = true;
+        }
+        else if (device.firstCommandRecieved && c.isInitial) {
+            device.logCommand(c, `Skipped initial shutter to ${pPosition} as we recieved a command already`);
+            return;
+        }
+        if (device.currentLevel === pPosition && !c.isForceAction) {
+            device.logCommand(c, `Skip shutter command to Position ${pPosition} as this is the current one`, enums_1.LogDebugType.SkipUnchangedRolloPosition);
+            return;
+        }
+        if (c.disableAutomaticCommand === undefined && c.isForceAction) {
+            c.disableAutomaticCommand = device.settings.buildBlockAutomaticCommand(c);
+        }
+        if (c.disableAutomaticCommand) {
+            device.blockAutomationHandler.disableAutomatic(c.disableAutomaticCommand);
+        }
+        device.logCommand(c);
+        if (device.window !== undefined) {
+            if (device.window.griffeInPosition(enums_1.WindowPosition.open) > 0 && pPosition < 100) {
+                if (!c.skipOpenWarning) {
+                    device.log(enums_1.LogLevel.Alert, 'Not closing the shutter, as the window is open!');
+                }
+                return;
+            }
+            if (device.window.griffeInPosition(enums_1.WindowPosition.tilted) > 0 && pPosition < 50) {
+                pPosition = 50;
+                if (!c.skipOpenWarning) {
+                    device.log(enums_1.LogLevel.Alert, 'Not closing the shutter, as the window is half open!');
+                }
+            }
+        }
+        // Set the level and move
+        device.log(enums_1.LogLevel.Debug, `Move  to position ${pPosition}`);
+        device.writePositionStateToDevice(pPosition);
+    }
+}
+exports.ShutterUtils = ShutterUtils;

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

@@ -1,17 +1,25 @@
 import { VeluxDevice } from './veluxDevice';
-import { iShutter, iWindow } from '../../interfaces';
+import { iShutter, iTemporaryDisableAutomatic, iWindow } from '../../interfaces';
 import { ShutterSettings } from '../../settingsObjects';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-import { ShutterSetLevelCommand } from '../../command';
-export declare class VeluxShutter extends VeluxDevice implements iShutter {
+import { RestoreTargetAutomaticValueCommand, ShutterSetLevelCommand } from '../../command';
+import { BlockAutomaticHandler } from '../../services';
+export declare class VeluxShutter extends VeluxDevice implements iShutter, iTemporaryDisableAutomatic {
     /** @inheritDoc */
     settings: ShutterSettings;
     private readonly _setLevelSwitchID;
-    private _firstCommandRecieved;
+    /** @inheritDoc */
+    firstCommandRecieved: boolean;
+    /** @inheritDoc */
+    targetAutomaticValue: number;
+    /** @inheritDoc */
+    baseAutomaticLevel: number;
     private _setLevel;
     private _setLevelTime;
     private _currentLevel;
     private _window?;
+    /** @inheritDoc */
+    blockAutomationHandler: BlockAutomaticHandler;
     constructor(pInfo: IoBrokerDeviceInfo);
     get currentLevel(): number;
     get window(): iWindow | undefined;
@@ -21,5 +29,7 @@ export declare class VeluxShutter extends VeluxDevice implements iShutter {
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     persist(): void;
     setLevel(command: ShutterSetLevelCommand): void;
+    writePositionStateToDevice(pPosition: number): void;
+    restoreTargetAutomaticValue(command: RestoreTargetAutomaticValueCommand): void;
     private setCurrentLevel;
 }

package/lib/devices/velux/veluxShutter.js

@@ -7,19 +7,27 @@ const enums_1 = require("../../enums");
 const action_1 = require("../../action");
 const command_1 = require("../../command");
 const utils_1 = require("../../utils");
+const sharedFunctions_1 = require("../sharedFunctions");
+const services_1 = require("../../services");
 class VeluxShutter extends veluxDevice_1.VeluxDevice {
     constructor(pInfo) {
         var _a;
         super(pInfo, enums_1.DeviceType.VeluxShutter);
         /** @inheritDoc */
         this.settings = new settingsObjects_1.ShutterSettings();
-        this._firstCommandRecieved = false;
+        /** @inheritDoc */
+        this.firstCommandRecieved = false;
+        /** @inheritDoc */
+        this.targetAutomaticValue = 0;
+        /** @inheritDoc */
+        this.baseAutomaticLevel = 0;
         this._setLevel = -1;
         this._setLevelTime = -1;
         this._currentLevel = -1;
         this.jsonOmitKeys.push('_window');
         this.deviceCapabilities.push(enums_1.DeviceCapability.shutter);
         this._setLevelSwitchID = `${this.info.fullID}.targetPosition`;
+        this.blockAutomationHandler = new services_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));
         (_a = this.dbo) === null || _a === void 0 ? void 0 : _a.getLastDesiredPosition(this).then((val) => {
             var _a;
             if (val.desiredPosition === -1) {
@@ -61,44 +69,15 @@ class VeluxShutter extends veluxDevice_1.VeluxDevice {
         (_a = this.dbo) === null || _a === void 0 ? void 0 : _a.persistShutter(this);
     }
     setLevel(command) {
-        let targetLevel = command.level;
-        if (!this._firstCommandRecieved && !command.isInitial) {
-            this._firstCommandRecieved = true;
-        }
-        if (this._firstCommandRecieved && command.isInitial) {
-            this.log(enums_1.LogLevel.Debug, `Skipped initial Rollo to ${targetLevel} as we recieved a command already`);
-            return;
-        }
-        if (this.currentLevel === targetLevel && !command.isForceAction) {
-            this.log(enums_1.LogLevel.Debug, `Skip Rollo command to Position ${targetLevel} as this is the current one, commandLog: ${command.logMessage}`, enums_1.LogDebugType.SkipUnchangedRolloPosition);
-            return;
-        }
-        if (this._setLevelSwitchID === '') {
-            this.log(enums_1.LogLevel.Error, 'Keine Switch ID bekannt.');
-            return;
-        }
-        if (!this.checkIoConnection(true)) {
-            return;
-        }
-        this.logCommand(command);
-        if (this._window !== undefined) {
-            if (this._window.griffeInPosition(enums_1.WindowPosition.open) > 0 && command.level < 100) {
-                if (!command.skipOpenWarning) {
-                    this.log(enums_1.LogLevel.Alert, 'Not closing the shutter, as the window is open!');
-                }
-                return;
-            }
-            if (this._window.griffeInPosition(enums_1.WindowPosition.tilted) > 0 && targetLevel < 50) {
-                targetLevel = 50;
-                if (!command.skipOpenWarning) {
-                    this.log(enums_1.LogLevel.Alert, 'Not closing the shutter, as the window is half open!');
-                }
-            }
-        }
-        this._setLevel = targetLevel;
-        this.log(enums_1.LogLevel.Debug, `Fahre Rollo auf Position ${targetLevel}`);
+        sharedFunctions_1.ShutterUtils.setLevel(this, command);
+    }
+    writePositionStateToDevice(pPosition) {
+        this._setLevel = pPosition;
         // Level is inverted for Velux Adapter (100 = 0, 0 = 100, 25 = 75, etc.)
-        this.setState(this._setLevelSwitchID, Math.abs(targetLevel - 100));
+        this.setState(this._setLevelSwitchID, Math.abs(pPosition - 100));
+    }
+    restoreTargetAutomaticValue(command) {
+        this.setLevel(new command_1.ShutterSetLevelCommand(command, this.targetAutomaticValue));
     }
     setCurrentLevel(value, initial = false) {
         let correctedValue = Math.abs(value - 100);

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

@@ -1,20 +1,28 @@
 import { ZigbeeDevice } from './zigbeeDevice';
 import { iShutter, iWindow } from '../../../interfaces';
 import { ShutterSettings } from '../../../settingsObjects';
-import { ShutterSetLevelCommand } from '../../../command';
+import { RestoreTargetAutomaticValueCommand, ShutterSetLevelCommand } from '../../../command';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { DeviceType } from '../../../enums';
 import { ShutterCalibration } from '../../../models';
+import { BlockAutomaticHandler } from '../../../services';
 export declare class ZigbeeShutter extends ZigbeeDevice implements iShutter {
     /** @inheritDoc */
     settings: ShutterSettings;
     protected _iMovementFinishTimeout: NodeJS.Timeout | null;
-    protected _firstCommandRecieved: boolean;
+    /** @inheritDoc */
+    firstCommandRecieved: boolean;
     protected _setLevel: number;
     protected _setLevelTime: number;
     protected _shutterCalibrationData: ShutterCalibration;
     protected _currentLevel: number;
     protected _window?: iWindow;
+    /** Implements iTemporaryDisableAutomatic */
+    readonly blockAutomationHandler: BlockAutomaticHandler;
+    /** @inheritDoc */
+    targetAutomaticValue: number;
+    /** @inheritDoc */
+    baseAutomaticLevel: number;
     constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
     /** @inheritDoc */
     get currentLevel(): number;
@@ -31,10 +39,15 @@ export declare class ZigbeeShutter extends ZigbeeDevice implements iShutter {
     /** @inheritDoc */
     setLevel(c: ShutterSetLevelCommand): void;
     protected setCurrentLevel(value: number, isInitial?: boolean): void;
-    protected moveToPosition(pPosition: number): void;
+    writePositionStateToDevice(pPosition: number): void;
     protected getAverageUp(): number;
     protected getAverageDown(): number;
     protected isCalibrated(): boolean;
     protected persistCalibrationData(): void;
+    /**
+     * Restores the automatic value/state of the device
+     * @param command - The command to restore the automatic value/state
+     */
+    restoreTargetAutomaticValue(command: RestoreTargetAutomaticValueCommand): void;
     protected initializeMovementFinishTimeout(duration: number, endPosition: number): void;
 }