hoffmation-base 2.23.0 → 3.0.0-alpha.0

package/lib/server/devices/groups/Window.js

@@ -23,11 +23,10 @@ class Window extends base_group_1.BaseGroup {
     }
     /**
      * sets the desired Pos and moves rollo to this level
-     * @param {number} value
      */
-    setDesiredPosition(value) {
-        this.desiredPosition = value;
-        this.restoreDesiredPosition();
+    setDesiredPosition(c) {
+        this.desiredPosition = c.position;
+        this.restoreDesiredPosition(new models_2.WindowRestoreDesiredPositionCommand(c));
     }
     getHandle() {
         return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.Handle);
@@ -60,19 +59,14 @@ class Window extends base_group_1.BaseGroup {
                     element.vibrationBlockedByGriff = true;
                 });
                 const timeOfDay = services_1.TimeCallbackService.dayType(this.getRoom().settings.rolloOffset);
-                if (services_1.TimeCallbackService.darkOutsideOrNight(timeOfDay)) {
-                    services_1.ShutterService.windowAllMiddle(this);
-                }
-                else {
-                    services_1.ShutterService.windowAllUp(this);
-                }
+                services_1.ShutterService.windowAllToPosition(this, new models_2.ShutterSetLevelCommand(models_2.CommandSource.Automatic, services_1.TimeCallbackService.darkOutsideOrNight(timeOfDay) ? 50 : 100, 'Window ajar by handle'));
             });
             griff.addOffenCallback((offen) => {
                 if (offen) {
                     this.getVibration().forEach((element) => {
                         element.vibrationBlockedByGriff = true;
                     });
-                    services_1.ShutterService.windowAllUp(this);
+                    services_1.ShutterService.windowAllToPosition(this, new models_2.ShutterSetLevelCommand(models_2.CommandSource.Automatic, 100, 'Window opened by handle'));
                     return;
                 }
             });
@@ -89,7 +83,7 @@ class Window extends base_group_1.BaseGroup {
                             }
                         }, 12000);
                     });
-                    this.restoreDesiredPosition();
+                    this.restoreDesiredPosition(new models_2.WindowRestoreDesiredPositionCommand(models_2.CommandSource.Automatic, 'Last window Handle closed'));
                 }
             });
         });
@@ -105,11 +99,11 @@ class Window extends base_group_1.BaseGroup {
     rolloPositionChange(pValue) {
         this.log(models_2.LogLevel.Debug, `Rollo Position Change in ${this.roomName} to ${pValue}`, pValue == this.desiredPosition ? services_1.LogDebugType.None : services_1.LogDebugType.ShutterPositionChange);
         if (pValue === 0 || pValue === 100) {
-            this.getRoom().setLightTimeBased(true);
+            this.getRoom().setLightTimeBased(new models_2.RoomSetLightTimeBasedCommand(models_2.CommandSource.Automatic, true, 'Window.rolloPositionChange'));
         }
     }
-    restoreDesiredPosition() {
-        services_1.ShutterService.windowAllToPosition(this, this.desiredPosition, false);
+    restoreDesiredPosition(c) {
+        services_1.ShutterService.windowAllToPosition(this, new models_2.ShutterSetLevelCommand(c, this.desiredPosition));
     }
 }
 exports.Window = Window;

package/lib/server/devices/groups/lightGroup.d.ts

@@ -1,6 +1,6 @@
 import { BaseGroup } from './base-group';
 import { iActuator, iLamp } from '../baseDeviceInterfaces';
-import { TimeCallback, TimeOfDay } from '../../../models';
+import { ActuatorSetStateCommand, LampSetLightCommand, LampSetTimeBasedCommand, LedSetLightCommand, LightGroupSwitchTimeConditionalCommand, TimeCallback, TimeOfDay, WledSetLightCommand } from '../../../models';
 import { WledDevice } from '../wledDevice';
 import { iLedRgbCct } from '../baseDeviceInterfaces/iLedRgbCct';
 export declare class LightGroup extends BaseGroup {
@@ -15,12 +15,14 @@ export declare class LightGroup extends BaseGroup {
     getOutlets(): iActuator[];
     getAllAsActuator(): iActuator[];
     handleSunriseOff(): void;
-    switchAll(target: boolean, force?: boolean): void;
-    switchTimeConditional(time: TimeOfDay): void;
-    setAllLampen(pValue: boolean, time?: TimeOfDay, force?: boolean, timeout?: number): void;
-    setAllStecker(pValue: boolean, time?: TimeOfDay, force?: boolean): void;
-    setAllLED(pValue: boolean, brightness?: number, color?: string, colortemp?: number): void;
-    setAllWled(pValue: boolean, brightness?: number, preset?: number): void;
+    switchAll(c: ActuatorSetStateCommand): void;
+    switchTimeConditional(c: LightGroupSwitchTimeConditionalCommand): void;
+    setAllLampen(c: LampSetLightCommand): void;
+    setAllLampenTimeBased(c: LampSetTimeBasedCommand): void;
+    setAllactuator(c: ActuatorSetStateCommand): void;
+    setAllActuatorsTimeBased(time: TimeOfDay): void;
+    setAllLED(c: LedSetLightCommand): void;
+    setAllWled(c: WledSetLightCommand): void;
     initialize(): void;
     recalculateTimeCallbacks(): void;
     private reconfigureSunriseTimeCallback;

package/lib/server/devices/groups/lightGroup.js

@@ -65,85 +65,91 @@ class LightGroup extends base_group_1.BaseGroup {
             return;
         }
         this.log(models_1.LogLevel.Info, `Es ist hell genug --> Schalte Lampen im ${this.roomName} aus`);
-        this.switchAll(false);
+        this.switchAll(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, false, 'LightGroup handleSunriseOff'));
     }
-    switchAll(target, force = false) {
+    switchAll(c) {
         this.getAllAsActuator().forEach((a) => {
-            if (a.settings.includeInAmbientLight && !force && !target && this._ambientLightOn) {
+            if (a.settings.includeInAmbientLight && !c.isForceAction && !c.on && this._ambientLightOn) {
                 a.log(models_1.LogLevel.Info, `Ambient light mode is active --> Skip non force light off command in ${this.roomName}`);
                 return;
             }
-            a.setActuator(target, undefined, force);
+            a.setActuator(c);
         });
     }
-    switchTimeConditional(time) {
-        const darkOutside = services_1.TimeCallbackService.darkOutsideOrNight(time);
+    switchTimeConditional(c) {
+        const darkOutside = services_1.TimeCallbackService.darkOutsideOrNight(c.time);
         let resultLampen = false;
         let resultSteckdosen = false;
         let activatedGroups = 0;
+        const command = new models_1.LampSetTimeBasedCommand(c, c.time, 'LightGroup switchTimeConditional');
         if (this.getWled().length > 0) {
             activatedGroups++;
-            this.log(models_1.LogLevel.Debug, `Set Wled time based for time "${models_1.TimeOfDay[time]}"`);
+            this.log(models_1.LogLevel.Debug, `Set Wled time based for time "${models_1.TimeOfDay[c.time]}"`);
             this.getWled().forEach((wled) => {
-                wled.setTimeBased(time);
+                wled.setTimeBased(command);
             });
         }
         if (this.getLED().length > 0) {
             activatedGroups++;
-            this.log(models_1.LogLevel.Trace, `Set LEDs time based for time "${models_1.TimeOfDay[time]}"`);
+            this.log(models_1.LogLevel.Trace, `Set LEDs time based for time "${models_1.TimeOfDay[c.time]}"`);
             this.getLED().forEach((s) => {
-                s.setTimeBased(time);
+                s.setTimeBased(command);
             });
         }
         if (this.getOutlets().length > 0) {
             activatedGroups++;
-            this.log(models_1.LogLevel.Trace, `Set outlets time based for time "${models_1.TimeOfDay[time]}"`);
+            this.log(models_1.LogLevel.Trace, `Set outlets time based for time "${models_1.TimeOfDay[c.time]}"`);
             resultSteckdosen = darkOutside;
         }
         if (activatedGroups === 0 || this.getRoom().settings.includeLampsInNormalMovementLightning) {
-            this.log(models_1.LogLevel.Trace, `Set Lamps time based for time "${models_1.TimeOfDay[time]}"`);
+            this.log(models_1.LogLevel.Trace, `Set Lamps time based for time "${models_1.TimeOfDay[c.time]}"`);
             resultLampen = darkOutside;
         }
-        this.setAllLampen(resultLampen, time);
-        this.setAllStecker(resultSteckdosen, time);
+        if (resultLampen) {
+            this.setAllLampenTimeBased(new models_1.LampSetTimeBasedCommand(models_1.CommandSource.Automatic, c.time, 'LightGroup switchTimeConditional'));
+        }
+        else {
+            this.setAllLampen(new models_1.LampSetLightCommand(models_1.CommandSource.Automatic, false, 'LightGroup switchTimeConditional --> off'));
+        }
+        if (resultSteckdosen) {
+            this.setAllActuatorsTimeBased(c.time);
+        }
+        else {
+            this.setAllactuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, false, 'LightGroup switchTimeConditional --> off'));
+        }
     }
-    setAllLampen(pValue, time, force = false, timeout) {
+    setAllLampen(c) {
         this.getLights().forEach((s) => {
-            if (!pValue ||
-                time === undefined ||
-                (time === models_1.TimeOfDay.Night && s.settings.nightOn) ||
-                (time === models_1.TimeOfDay.BeforeSunrise && s.settings.dawnOn) ||
-                (time === models_1.TimeOfDay.AfterSunset && s.settings.duskOn)) {
-                timeout !== null && timeout !== void 0 ? timeout : (timeout = pValue && force ? 30 * 60 * 1000 : -1);
-                if (pValue && time !== undefined) {
-                    s.setTimeBased(time, timeout, force);
-                }
-                else {
-                    s.setLight(pValue, timeout, force);
-                }
-            }
+            s.setLight(c);
+        });
+    }
+    setAllLampenTimeBased(c) {
+        this.getLights().forEach((s) => {
+            s.setTimeBased(c);
+        });
+    }
+    setAllactuator(c) {
+        this.getOutlets().forEach((s) => {
+            s.setActuator(c);
         });
     }
-    setAllStecker(pValue, time, force = false) {
+    setAllActuatorsTimeBased(time) {
         this.getOutlets().forEach((s) => {
-            if (!pValue ||
-                time === undefined ||
-                (time === models_1.TimeOfDay.Night && s.settings.nightOn) ||
+            if ((time === models_1.TimeOfDay.Night && s.settings.nightOn) ||
                 (time === models_1.TimeOfDay.BeforeSunrise && s.settings.dawnOn) ||
                 (time === models_1.TimeOfDay.AfterSunset && s.settings.duskOn)) {
-                const timeout = pValue && force ? 30 * 60 * 1000 : -1;
-                s.setActuator(pValue, timeout, force);
+                s.setActuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, true, `LightGroup setAllActuatorsTimeBased`));
             }
         });
     }
-    setAllLED(pValue, brightness = -1, color = '', colortemp = -1) {
+    setAllLED(c) {
         this.getLED().forEach((s) => {
-            s.setLight(pValue, undefined, true, brightness, undefined, color, colortemp);
+            s.setLight(c);
         });
     }
-    setAllWled(pValue, brightness = -1, preset) {
+    setAllWled(c) {
         this.getWled().forEach((w) => {
-            w.setWled(pValue, brightness, preset);
+            w.setWled(c);
         });
     }
     initialize() {
@@ -202,7 +208,7 @@ class LightGroup extends base_group_1.BaseGroup {
         this.log(models_1.LogLevel.Info, `Draußen wird es dunkel --> Aktiviere Ambientenbeleuchtung`);
         this.getAllAsActuator().forEach((a) => {
             if (a.settings.includeInAmbientLight) {
-                a.setActuator(true);
+                a.setActuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, true, 'Ambient Light Start Callback'));
             }
         });
         services_1.Utils.guardedTimeout(() => {
@@ -210,7 +216,7 @@ class LightGroup extends base_group_1.BaseGroup {
             this.log(models_1.LogLevel.Info, `Ambientenbeleuchtung um Mitternacht abschalten.`);
             this._ambientLightOn = false;
             if (((_a = this.getRoom().PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent()) !== true) {
-                this.switchAll(false);
+                this.switchAll(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, false, 'Ambient Light End Callback'));
             }
         }, services_1.Utils.timeTilMidnight, this);
     }

package/lib/server/devices/groups/presenceGroup.js

@@ -38,14 +38,14 @@ class PresenceGroup extends base_group_1.BaseGroup {
         this.addLastLeftCallback(() => {
             var _a, _b;
             (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.changeVibrationMotionBlock(false);
-            (_b = this.getRoom().LightGroup) === null || _b === void 0 ? void 0 : _b.switchAll(false);
+            (_b = this.getRoom().LightGroup) === null || _b === void 0 ? void 0 : _b.switchAll(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, false, 'Presence Group LastLeftCallback'));
         });
         this.addFirstEnterCallback(() => {
             if (!this.getRoom().settings.lampenBeiBewegung) {
                 return;
             }
             this.log(models_1.LogLevel.DeepTrace, `Bewegung im Raum ${this.roomName} festgestellt --> Licht einschalten`);
-            this.getRoom().setLightTimeBased();
+            this.getRoom().setLightTimeBased(new models_1.RoomSetLightTimeBasedCommand(models_1.CommandSource.Automatic, true, 'Motion detected'));
         });
         this.getMotionDetector().forEach((b) => {
             b.addMovementCallback((val) => {

package/lib/server/devices/groups/tasterGroup.js

@@ -7,6 +7,7 @@ const group_type_1 = require("./group-type");
 const device_list_1 = require("../device-list");
 const services_1 = require("../../services");
 const button_1 = require("../button");
+const models_1 = require("../../../models");
 class TasterGroup extends base_group_1.BaseGroup {
     constructor(roomName, buttonIds) {
         super(roomName, group_type_1.GroupType.Buttons);
@@ -20,30 +21,45 @@ class TasterGroup extends base_group_1.BaseGroup {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             (_a = t.buttonTopLeft) === null || _a === void 0 ? void 0 : _a.addCb(button_1.ButtonPressType.long, (pValue) => {
                 var _a;
-                pValue && ((_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.allRolloDown(false, true));
+                if (!pValue) {
+                    return;
+                }
+                (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.setDesiredPosition(new models_1.WindowSetDesiredPositionCommand(models_1.CommandSource.Manual, 0, 'Button Top Left pressed long'));
             }, `Close all Rollos in this room`);
             (_b = t.buttonTopLeft) === null || _b === void 0 ? void 0 : _b.addCb(button_1.ButtonPressType.short, (pValue) => {
                 var _a;
-                pValue && ((_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.allRolloToLevel(25, true));
+                if (!pValue) {
+                    return;
+                }
+                (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.setDesiredPosition(new models_1.WindowSetDesiredPositionCommand(models_1.CommandSource.Manual, 25, 'Button Top Left pressed short'));
             }, `Nearly closes all Rollos in this room`);
             (_c = t.buttonTopRight) === null || _c === void 0 ? void 0 : _c.addCb(button_1.ButtonPressType.long, (pValue) => {
                 var _a;
                 if (!pValue) {
                     return;
                 }
-                (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.allRolloUp(true);
+                (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.setDesiredPosition(new models_1.WindowSetDesiredPositionCommand(models_1.CommandSource.Manual, 100, 'Button Top Right pressed long'));
             }, `Open all Rollos in this room`);
             (_d = t.buttonTopRight) === null || _d === void 0 ? void 0 : _d.addCb(button_1.ButtonPressType.short, (pValue) => {
                 var _a;
-                pValue && ((_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.allRolloToLevel(50, true));
+                if (!pValue) {
+                    return;
+                }
+                (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.setDesiredPosition(new models_1.WindowSetDesiredPositionCommand(models_1.CommandSource.Manual, 50, 'Button Top Right pressed short'));
             }, `All Rollos in this room to middle`);
             (_e = t.buttonMidLeft) === null || _e === void 0 ? void 0 : _e.addCb(button_1.ButtonPressType.long, (pValue) => {
                 var _a;
-                pValue && ((_a = this.getRoom().LightGroup) === null || _a === void 0 ? void 0 : _a.switchAll(true, true));
+                if (!pValue) {
+                    return;
+                }
+                (_a = this.getRoom().LightGroup) === null || _a === void 0 ? void 0 : _a.switchAll(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Manual, true, 'Button press to turn all lights on'));
             }, `Turn all Lights in this room on`);
             (_f = t.buttonMidRight) === null || _f === void 0 ? void 0 : _f.addCb(button_1.ButtonPressType.long, (pValue) => {
                 var _a;
-                pValue && ((_a = this.getRoom().LightGroup) === null || _a === void 0 ? void 0 : _a.switchAll(false, true));
+                if (!pValue) {
+                    return;
+                }
+                (_a = this.getRoom().LightGroup) === null || _a === void 0 ? void 0 : _a.switchAll(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Manual, false, 'Button press to turn all lights off'));
             }, `Turn all Lights in this room off`);
             if (((_g = services_1.SettingsService.settings.sonos) === null || _g === void 0 ? void 0 : _g.buttonBotRightForRadio) === true) {
                 const sonosGroup = this.getRoom().SonosGroup;

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

@@ -1,4 +1,4 @@
-import { TimeCallback } from '../../../models';
+import { RoomRestoreShutterPositionCommand, ShutterSunriseUpCommand, TimeCallback, WindowSetDesiredPositionCommand, WindowSetRolloByWeatherStatusCommand } from '../../../models';
 import { Window } from './Window';
 import { BaseGroup } from './base-group';
 export declare class WindowGroup extends BaseGroup {
@@ -6,14 +6,12 @@ export declare class WindowGroup extends BaseGroup {
     sunriseShutterCallback: TimeCallback | undefined;
     sunsetShutterCallback: TimeCallback | undefined;
     constructor(roomName: string, windows: Window[]);
-    allRolloDown(initial?: boolean, savePosition?: boolean): void;
-    allRolloUp(savePosition?: boolean): void;
-    allRolloToLevel(level: number, savePosition?: boolean): void;
+    setDesiredPosition(c: WindowSetDesiredPositionCommand): void;
     initialize(): void;
     recalcTimeCallbacks(): void;
-    setRolloByWeatherStatus(): void;
-    sunriseUp(initial?: boolean): void;
-    restoreRolloPosition(recalc?: boolean): void;
+    setRolloByWeatherStatus(c: WindowSetRolloByWeatherStatusCommand): void;
+    sunriseUp(c: ShutterSunriseUpCommand): void;
+    restoreRolloPosition(c: RoomRestoreShutterPositionCommand): void;
     changeVibrationMotionBlock(block: boolean): void;
     private sunsetDown;
     private reconfigureSunsetShutterCallback;

package/lib/server/devices/groups/windowGroup.js

@@ -27,35 +27,21 @@ class WindowGroup extends base_group_1.BaseGroup {
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Shutter, new device_list_1.DeviceList(shutterIds));
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.MagnetContact, new device_list_1.DeviceList(magnetIds));
     }
-    allRolloDown(initial = false, savePosition = false) {
+    setDesiredPosition(c) {
         this.windows.forEach((f) => {
-            if (savePosition)
-                f.desiredPosition = 0;
-            services_1.ShutterService.windowAllDown(f, initial);
-        });
-    }
-    allRolloUp(savePosition = false) {
-        this.windows.forEach((f) => {
-            if (savePosition) {
-                f.desiredPosition = 100;
-            }
-            services_1.ShutterService.windowAllUp(f);
-        });
-    }
-    allRolloToLevel(level, savePosition = false) {
-        this.windows.forEach((f) => {
-            if (savePosition) {
-                f.desiredPosition = level;
-            }
-            services_1.ShutterService.windowAllToPosition(f, level, false);
+            f.setDesiredPosition(c);
         });
     }
     initialize() {
         const room = this.getRoom();
         this.recalcTimeCallbacks();
         if (room.settings.rolloHeatReduction) {
-            services_1.Utils.guardedInterval(this.setRolloByWeatherStatus, 15 * 60 * 1000, this, false);
-            services_1.Utils.guardedTimeout(this.setRolloByWeatherStatus, 2 * 60 * 1000, this);
+            services_1.Utils.guardedInterval(() => {
+                this.setRolloByWeatherStatus(new models_1.WindowSetRolloByWeatherStatusCommand(models_1.CommandSource.Automatic, 'Regular interval'));
+            }, 15 * 60 * 1000, this, false);
+            services_1.Utils.guardedTimeout(() => {
+                this.setRolloByWeatherStatus(new models_1.WindowSetRolloByWeatherStatusCommand(models_1.CommandSource.Automatic, 'Delayed initial check'));
+            }, 2 * 60 * 1000, this);
         }
         this.windows.forEach((f) => {
             f.initialize();
@@ -65,7 +51,7 @@ class WindowGroup extends base_group_1.BaseGroup {
         this.reconfigureSunriseShutterCallback();
         this.reconfigureSunsetShutterCallback();
     }
-    setRolloByWeatherStatus() {
+    setRolloByWeatherStatus(c) {
         const room = this.getRoom();
         const timeOfDay = services_1.TimeCallbackService.dayType(room.settings.rolloOffset);
         const darkOutside = services_1.TimeCallbackService.darkOutsideOrNight(timeOfDay);
@@ -76,7 +62,7 @@ class WindowGroup extends base_group_1.BaseGroup {
                 return;
             }
             if (darkOutside) {
-                f.restoreDesiredPosition();
+                f.restoreDesiredPosition(new models_1.WindowRestoreDesiredPositionCommand(c, `It's dark outside.`));
                 return;
             }
             let desiredPos = f.desiredPosition;
@@ -89,30 +75,29 @@ class WindowGroup extends base_group_1.BaseGroup {
             if (f.griffeInPosition(models_2.WindowPosition.kipp) > 0) {
                 desiredPos = Math.max(30, desiredPos);
             }
-            services_1.ShutterService.windowAllToPosition(f, desiredPos, false, true);
+            services_1.ShutterService.windowAllToPosition(f, new models_1.ShutterSetLevelCommand(c, desiredPos, '', true));
         });
     }
-    sunriseUp(initial = false) {
+    sunriseUp(c) {
         this.windows.forEach((f) => {
             if (!this.getRoom().settings.sonnenAufgangRollos || f.getShutter().length === 0) {
                 return;
             }
-            this.log(models_1.LogLevel.Debug, `Fahre das Rollo zum Sonnenaufgang ${initial ? '(ggf. nachträglich)' : ''} hoch`);
-            f.setDesiredPosition(100);
+            f.setDesiredPosition(new models_1.WindowSetDesiredPositionCommand(c, 100));
         });
     }
-    restoreRolloPosition(recalc = false) {
-        if (!recalc) {
+    restoreRolloPosition(c) {
+        if (!c.recalc) {
             this.windows.forEach((f) => {
-                f.restoreDesiredPosition();
+                f.restoreDesiredPosition(new models_1.WindowRestoreDesiredPositionCommand(c));
             });
             return;
         }
         if (!services_1.TimeCallbackService.darkOutsideOrNight(services_1.TimeCallbackService.dayType(this.getRoom().settings.rolloOffset))) {
-            this.sunriseUp(true);
+            this.sunriseUp(new models_1.ShutterSunriseUpCommand(c, 'It is daytime'));
         }
         else {
-            this.sunsetDown();
+            this.sunsetDown(new models_1.ShutterSunsetDownCommand(c, 'It is dark outside or nighttime'));
         }
     }
     changeVibrationMotionBlock(block) {
@@ -125,13 +110,10 @@ class WindowGroup extends base_group_1.BaseGroup {
             });
         });
     }
-    sunsetDown() {
-        var _a, _b;
-        this.allRolloToLevel(0, true);
+    sunsetDown(c) {
+        this.setDesiredPosition(new models_1.WindowSetDesiredPositionCommand(c, 0));
         const room = this.getRoom();
-        if (((_a = room.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent()) && room.settings.lampOffset) {
-            (_b = room.LightGroup) === null || _b === void 0 ? void 0 : _b.switchTimeConditional(services_1.TimeCallbackService.dayType(room.settings.lampOffset));
-        }
+        room.setLightTimeBased(new models_1.RoomSetLightTimeBasedCommand(c, true, 'sunsetDown'));
     }
     reconfigureSunsetShutterCallback() {
         const room = this.getRoom();
@@ -155,11 +137,11 @@ class WindowGroup extends base_group_1.BaseGroup {
         if (this.sunsetShutterCallback === undefined) {
             this.log(models_1.LogLevel.Debug, `Add Sunset Shutter callback for ${this.roomName}`);
             this.sunsetShutterCallback = new models_1.TimeCallback(`${this.roomName} Sunset Shutter`, models_1.TimeCallbackType.SunSet, () => {
-                this.sunsetDown();
+                this.sunsetDown(new models_1.ShutterSunsetDownCommand(models_1.CommandSource.Automatic, 'Time-Callback fired'));
             }, room.settings.rolloOffset.sunset);
             if (services_1.TimeCallbackService.darkOutsideOrNight(services_1.TimeCallbackService.dayType(room.settings.rolloOffset))) {
                 services_1.Utils.guardedTimeout(() => {
-                    this.allRolloDown(true, true);
+                    this.setDesiredPosition(new models_1.WindowSetDesiredPositionCommand(models_1.CommandSource.Initial, 0, 'It is dark outside'));
                 }, 60000, this);
             }
             services_1.TimeCallbackService.addCallback(this.sunsetShutterCallback);
@@ -188,10 +170,10 @@ class WindowGroup extends base_group_1.BaseGroup {
                     room.skipNextRolloUp = false;
                     return;
                 }
-                this.sunriseUp();
+                this.sunriseUp(new models_1.ShutterSunriseUpCommand(models_1.CommandSource.Automatic, 'Time-Callback fired'));
             }, room.settings.rolloOffset.sunrise, undefined, undefined, room.settings.rolloOffset);
             if (!services_1.TimeCallbackService.darkOutsideOrNight(services_1.TimeCallbackService.dayType(room.settings.rolloOffset))) {
-                this.sunriseUp(true);
+                this.sunriseUp(new models_1.ShutterSunriseUpCommand(models_1.CommandSource.Initial, 'Initial sunrise up as it is day'));
             }
             services_1.TimeCallbackService.addCallback(this.sunriseShutterCallback);
         }

package/lib/server/devices/hmIPDevices/hmIpLampe.d.ts

@@ -1,5 +1,5 @@
 import { HmIPDevice } from './hmIpDevice';
-import { ActuatorSettings, TimeOfDay } from '../../../models';
+import { ActuatorSetStateCommand, ActuatorSettings, ActuatorToggleCommand, ActuatorWriteStateToDeviceCommand, LampSetLightCommand, LampSetTimeBasedCommand, LampToggleLightCommand, RestoreTargetAutomaticValueCommand } from '../../../models';
 import { iLamp, iTemporaryDisableAutomatic } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { BlockAutomaticHandler } from '../../services/blockAutomaticHandler';
@@ -12,13 +12,14 @@ export declare class HmIpLampe extends HmIPDevice implements iLamp, iTemporaryDi
     targetAutomaticState: boolean;
     constructor(pInfo: IoBrokerDeviceInfo);
     get actuatorOn(): boolean;
-    restoreTargetAutomaticValue(): void;
+    restoreTargetAutomaticValue(c: RestoreTargetAutomaticValueCommand): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
-    setActuator(pValue: boolean, timeout?: number, force?: boolean): void;
-    toggleActuator(force: boolean): boolean;
+    setActuator(command: ActuatorSetStateCommand): void;
+    toggleActuator(c: ActuatorToggleCommand): boolean;
     /** @inheritdoc */
-    setLight(pValue: boolean, timeout?: number, force?: boolean): void;
-    toggleLight(time?: TimeOfDay, force?: boolean, calculateTime?: boolean): boolean;
-    setTimeBased(time: TimeOfDay, timeout?: number, force?: boolean): void;
+    setLight(c: LampSetLightCommand): void;
+    writeActuatorStateToDevice(c: ActuatorWriteStateToDeviceCommand): void;
+    toggleLight(c: LampToggleLightCommand): boolean;
+    setTimeBased(c: LampSetTimeBasedCommand): void;
     persist(): void;
 }

package/lib/server/devices/hmIPDevices/hmIpLampe.js

@@ -24,9 +24,9 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
     get actuatorOn() {
         return this.lightOn;
     }
-    restoreTargetAutomaticValue() {
-        this.log(models_1.LogLevel.Debug, `Restore Target Automatic value`);
-        this.setActuator(this.targetAutomaticState);
+    restoreTargetAutomaticValue(c) {
+        this.log(models_1.LogLevel.Debug, c.logMessage);
+        this.setLight(new models_1.LampSetLightCommand(c, this.targetAutomaticState, 'Lampen RestoreTargetAutomaticValue'));
     }
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Lampen Update : ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
@@ -41,45 +41,33 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
                 break;
         }
     }
-    setActuator(pValue, timeout, force) {
-        this.setLight(pValue, timeout, force);
+    setActuator(command) {
+        this.setLight(command);
     }
-    toggleActuator(force) {
-        return this.toggleLight(undefined, force);
+    toggleActuator(c) {
+        const setActuatorCommand = models_1.ActuatorSetStateCommand.byActuatorAndToggleCommand(this, c);
+        this.setActuator(setActuatorCommand);
+        return setActuatorCommand.on;
     }
     /** @inheritdoc */
-    setLight(pValue, timeout = -1, force = false) {
-        if (sharedFunctions_1.LampUtils.checkBlockActive(this, force, pValue)) {
-            return;
-        }
-        if (sharedFunctions_1.LampUtils.checkUnchanged(this, force, pValue)) {
-            return;
-        }
+    setLight(c) {
         if (this.lightOnSwitchID === '') {
             this.log(models_1.LogLevel.Error, `Keine Switch ID bekannt.`);
             return;
         }
-        this.log(models_1.LogLevel.Debug, `Set Light Acutator to "${pValue}"`, services_1.LogDebugType.SetActuator);
-        this.queuedValue = pValue;
-        this.setState(this.lightOnSwitchID, pValue, undefined, (err) => {
+        sharedFunctions_1.LampUtils.setActuator(this, c);
+    }
+    writeActuatorStateToDevice(c) {
+        this.log(models_1.LogLevel.Debug, c.logMessage, services_1.LogDebugType.SetActuator);
+        this.setState(this.lightOnSwitchID, c.stateValue, undefined, (err) => {
             this.log(models_1.LogLevel.Error, `Lampe schalten ergab Fehler: ${err}`);
         });
-        if (this.settings.isStromStoss && pValue) {
-            timeout = 3000;
-            sharedFunctions_1.LampUtils.stromStossOn(this);
-        }
-        if (timeout < 0 || !pValue) {
-            return;
-        }
-        if (timeout > -1) {
-            this.blockAutomationHandler.disableAutomatic(timeout, models_1.CollisionSolving.overrideIfGreater);
-        }
     }
-    toggleLight(time, force = false, calculateTime = false) {
-        return sharedFunctions_1.LampUtils.toggleLight(this, time, force, calculateTime);
+    toggleLight(c) {
+        return sharedFunctions_1.LampUtils.toggleLight(this, c);
     }
-    setTimeBased(time, timeout = -1, force = false) {
-        sharedFunctions_1.LampUtils.setTimeBased(this, time, timeout, force);
+    setTimeBased(c) {
+        sharedFunctions_1.LampUtils.setTimeBased(this, c);
     }
     persist() {
         var _a;

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

@@ -1,6 +1,6 @@
 import { HmIPDevice } from './hmIpDevice';
 import { Window } from '../groups';
-import { ShutterSettings } from '../../../models';
+import { ShutterSetLevelCommand, ShutterSettings } from '../../../models';
 import { iShutter } from '../baseDeviceInterfaces';
 import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
@@ -20,6 +20,6 @@ export declare class HmIpRoll extends HmIPDevice implements iShutter {
     get desiredWindowShutterLevel(): number;
     persist(): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
-    setLevel(pPosition: number, initial?: boolean, skipOpenWarning?: boolean): void;
+    setLevel(command: ShutterSetLevelCommand): void;
     toJSON(): Partial<IoBrokerBaseDevice>;
 }