hoffmation-base 3.0.0-alpha.3 → 3.0.0-alpha.31

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

@@ -12,6 +12,7 @@ const models_1 = require("../../../models");
 class HeatGroup extends base_group_1.BaseGroup {
     constructor(roomName, heaterIds, tempSensorIds, humiditySensorIds, acIds) {
         super(roomName, group_type_1.GroupType.Heating);
+        /** @inheritDoc */
         this.settings = new heatGroupSettings_1.HeatGroupSettings();
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Heater, new device_list_1.DeviceList(heaterIds));
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.TemperaturSensor, new device_list_1.DeviceList(tempSensorIds));
@@ -19,8 +20,8 @@ class HeatGroup extends base_group_1.BaseGroup {
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Ac, new device_list_1.DeviceList(acIds));
     }
     /**
-     * The current measured temperature of the room in Celsius
-     * @returns {number}
+     * Calculates the combined humidity Level in this room
+     * @returns The humidity in percent
      */
     get humidity() {
         let humidity = baseDeviceInterfaces_1.UNDEFINED_HUMIDITY_VALUE;
@@ -40,8 +41,8 @@ class HeatGroup extends base_group_1.BaseGroup {
         return humidity;
     }
     /**
-     * The current measured temperature of the room in Celsius
-     * @returns {number}
+     * Calculates the temperature based on all available sensors.
+     * @returns The temperature in °C
      */
     get temperature() {
         let temp = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
@@ -93,8 +94,8 @@ class HeatGroup extends base_group_1.BaseGroup {
         rooms.sort((a, b) => {
             return a.roomName.localeCompare(b.roomName);
         });
-        const response = [`Dies sind die aktuellen Informationen der Heizungen:`];
-        response.push(`Name\t\tLuft Feuchtigkeit\t\tAktuelle Temperatur\t\tSoll Temperatur\t\tVentilstellung`);
+        const response = ['Dies sind die aktuellen Informationen der Heizungen:'];
+        response.push('Name\t\tLuft Feuchtigkeit\t\tAktuelle Temperatur\t\tSoll Temperatur\t\tVentilstellung');
         for (const r of rooms) {
             response.push(`${r.roomName}:\t\t${(_a = r.HeatGroup) === null || _a === void 0 ? void 0 : _a.humidity}%\t\t${(_b = r.HeatGroup) === null || _b === void 0 ? void 0 : _b.temperature}°C\t\t${(_c = r.HeatGroup) === null || _c === void 0 ? void 0 : _c.desiredTemp}°C`);
         }
@@ -127,8 +128,9 @@ class HeatGroup extends base_group_1.BaseGroup {
     }
     /**
      * Sets all ACs to new desired Value
-     * @param {boolean} newDesiredState
-     * @param {boolean} force Whether this was a manual trigger, thus blocking automatic changes for 1 hour
+     * TODO: Migrate to new Command System
+     * @param newDesiredState - The new desired (on/off) state
+     * @param force - Whether this was a manual trigger, thus blocking automatic changes for 1 hour
      */
     setAc(newDesiredState, force = false) {
         const devs = this.getOwnAcDevices();
@@ -139,9 +141,7 @@ class HeatGroup extends base_group_1.BaseGroup {
                 continue;
             }
             dev.turnOff();
-            if (force) {
-                dev.deactivateAutomaticChange(60 * 60 * 1000);
-            }
+            dev.blockAutomationHandler.disableAutomatic(new models_1.BlockAutomaticCommand(force ? models_1.CommandSource.Force : models_1.CommandSource.Unknown, 60 * 60 * 1000));
         }
     }
     deleteAutomaticPoint(name) {

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

@@ -1,10 +1,18 @@
 import { BaseGroup } from './base-group';
 import { iActuator, iLamp } from '../baseDeviceInterfaces';
-import { ActuatorSetStateCommand, LampSetLightCommand, LampSetTimeBasedCommand, LedSetLightCommand, LightGroupSwitchTimeConditionalCommand, TimeCallback, TimeOfDay, WledSetLightCommand } from '../../../models';
+import { ActuatorSetStateCommand, LampSetLightCommand, LampSetTimeBasedCommand, LedSetLightCommand, LightGroupSwitchTimeConditionalCommand, TimeCallback, WledSetLightCommand } from '../../../models';
 import { WledDevice } from '../wledDevice';
 import { iLedRgbCct } from '../baseDeviceInterfaces/iLedRgbCct';
 export declare class LightGroup extends BaseGroup {
+    /**
+     * Time-Callback for the sunrise light off
+     * @remark This is undefined if the light should not be turned off at sunrise or no calculation has been done yet
+     */
     sonnenAufgangLichtCallback: TimeCallback | undefined;
+    /**
+     * Time-Callback for the sunset light on
+     * @remark This is undefined if the light should not be turned on at sunset or no calculation has been done yet
+     */
     sonnenUntergangLichtCallback: TimeCallback | undefined;
     private _ambientLightOn;
     constructor(roomName: string, lampenIds?: string[], steckerIds?: string[], ledIds?: string[], wledIds?: string[]);
@@ -20,7 +28,7 @@ export declare class LightGroup extends BaseGroup {
     setAllLampen(c: LampSetLightCommand): void;
     setAllLampenTimeBased(c: LampSetTimeBasedCommand): void;
     setAllOutlets(c: ActuatorSetStateCommand): void;
-    setAllActuatorsTimeBased(time: TimeOfDay): void;
+    setAllActuatorsTimeBased(c: LampSetTimeBasedCommand): void;
     setAllLED(c: LedSetLightCommand): void;
     setAllWled(c: WledSetLightCommand): void;
     initialize(): void;

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

@@ -34,7 +34,7 @@ class LightGroup extends base_group_1.BaseGroup {
             }
         }
         for (i = 0; i < this.getWled().length; i++) {
-            if (this.getWled()[i].on) {
+            if (this.getWled()[i].actuatorOn) {
                 return true;
             }
         }
@@ -70,7 +70,7 @@ class LightGroup extends base_group_1.BaseGroup {
     switchAll(c) {
         this.getAllAsActuator().forEach((a) => {
             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}`);
+                a.log(models_1.LogLevel.Info, `Ambient light mode is active --> Skip non force light off command in ${this.roomName}; command: ${c.logMessage}`);
                 return;
             }
             a.setActuator(c);
@@ -106,16 +106,16 @@ class LightGroup extends base_group_1.BaseGroup {
             resultLampen = darkOutside;
         }
         if (resultLampen) {
-            this.setAllLampenTimeBased(new models_1.LampSetTimeBasedCommand(models_1.CommandSource.Automatic, c.time, 'LightGroup switchTimeConditional'));
+            this.setAllLampenTimeBased(new models_1.LampSetTimeBasedCommand(c, c.time));
         }
         else {
-            this.setAllLampen(new models_1.LampSetLightCommand(models_1.CommandSource.Automatic, false, 'LightGroup switchTimeConditional --> off'));
+            this.setAllLampen(new models_1.LampSetLightCommand(c, false));
         }
         if (resultSteckdosen) {
-            this.setAllActuatorsTimeBased(c.time);
+            this.setAllActuatorsTimeBased(new models_1.LampSetTimeBasedCommand(c, c.time));
         }
         else {
-            this.setAllOutlets(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, false, 'LightGroup switchTimeConditional --> off'));
+            this.setAllOutlets(new models_1.ActuatorSetStateCommand(c, false));
         }
     }
     setAllLampen(c) {
@@ -133,12 +133,13 @@ class LightGroup extends base_group_1.BaseGroup {
             s.setActuator(c);
         });
     }
-    setAllActuatorsTimeBased(time) {
+    setAllActuatorsTimeBased(c) {
         this.getOutlets().forEach((s) => {
-            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)) {
-                s.setActuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, true, `LightGroup setAllActuatorsTimeBased`));
+            if ((c.time === models_1.TimeOfDay.Daylight && s.settings.dayOn) ||
+                (c.time === models_1.TimeOfDay.Night && s.settings.nightOn) ||
+                (c.time === models_1.TimeOfDay.BeforeSunrise && s.settings.dawnOn) ||
+                (c.time === models_1.TimeOfDay.AfterSunset && s.settings.duskOn)) {
+                s.setActuator(new models_1.ActuatorSetStateCommand(c, true, 'LightGroup setAllActuatorsTimeBased', c.disableAutomaticCommand));
             }
         });
     }
@@ -205,7 +206,7 @@ class LightGroup extends base_group_1.BaseGroup {
     }
     ambientLightStartCallback() {
         this._ambientLightOn = true;
-        this.log(models_1.LogLevel.Info, `Draußen wird es dunkel --> Aktiviere Ambientenbeleuchtung`);
+        this.log(models_1.LogLevel.Info, 'Draußen wird es dunkel --> Aktiviere Ambientenbeleuchtung');
         this.getAllAsActuator().forEach((a) => {
             if (a.settings.includeInAmbientLight) {
                 a.setActuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, true, 'Ambient Light Start Callback'));
@@ -213,7 +214,7 @@ class LightGroup extends base_group_1.BaseGroup {
         });
         services_1.Utils.guardedTimeout(() => {
             var _a;
-            this.log(models_1.LogLevel.Info, `Ambientenbeleuchtung um Mitternacht abschalten.`);
+            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(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, false, 'Ambient Light End Callback'));

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

@@ -1,5 +1,7 @@
 import { BaseGroup } from './base-group';
 import { iMotionSensor } from '../baseDeviceInterfaces';
+import { PresenceGroupFirstEnterAction } from '../../../models/action/presenceGroupFirstEnterAction';
+import { PresenceGroupLastLeftAction } from '../../../models/action/presenceGroupLastLeftAction';
 export declare class PresenceGroup extends BaseGroup {
     private _lastMovement;
     private _lastLeftTimeout;
@@ -8,14 +10,14 @@ export declare class PresenceGroup extends BaseGroup {
     constructor(roomName: string, motionSensorIds: string[]);
     getMotionDetector(): Array<iMotionSensor>;
     initCallbacks(): void;
+    addLastLeftCallback(cb: (action: PresenceGroupLastLeftAction) => void): void;
     presentAmount(): number;
     anyPresent(): boolean;
-    addLastLeftCallback(cb: () => void): void;
-    addFirstEnterCallback(cb: () => void): void;
+    addFirstEnterCallback(cb: (action: PresenceGroupFirstEnterAction) => void): void;
+    private motionSensorAnyMovement;
     private motionSensorOnLastLeft;
     /**
      * In case of an existing delayed last left callback timeout, this removes it.
-     * @private
      */
     private resetLastLeftTimeout;
     private motionSensorOnFirstEnter;

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

@@ -7,6 +7,8 @@ const base_group_1 = require("./base-group");
 const device_cluster_type_1 = require("../device-cluster-type");
 const group_type_1 = require("./group-type");
 const device_list_1 = require("../device-list");
+const presenceGroupFirstEnterAction_1 = require("../../../models/action/presenceGroupFirstEnterAction");
+const presenceGroupLastLeftAction_1 = require("../../../models/action/presenceGroupLastLeftAction");
 class PresenceGroup extends base_group_1.BaseGroup {
     constructor(roomName, motionSensorIds) {
         super(roomName, group_type_1.GroupType.Presence);
@@ -21,43 +23,28 @@ class PresenceGroup extends base_group_1.BaseGroup {
     }
     initCallbacks() {
         this.getMotionDetector().forEach((b) => {
-            b.addMovementCallback((val) => {
-                var _a;
-                if (!val) {
-                    return;
-                }
-                if (services_1.RoomService.awayModeActive || (services_1.RoomService.nightAlarmActive && !b.settings.excludeFromNightAlarm)) {
-                    services_1.RoomService.startIntrusionAlarm(this.getRoom(), b);
-                }
-                if (!b.settings.seesWindow) {
-                    (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.changeVibrationMotionBlock(true);
-                }
-                services_1.RoomService.movementHistory.add(`${services_1.Utils.nowString()}: Raum "${this.roomName}" Gerät "${b.info.fullName}"`);
+            b.addMovementCallback((action) => {
+                this.motionSensorOnFirstEnter(action);
+                this.motionSensorOnLastLeft(action);
+                this.motionSensorAnyMovement(action);
             });
         });
-        this.addLastLeftCallback(() => {
+        this.addLastLeftCallback((action) => {
             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(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, false, 'Presence Group LastLeftCallback'));
+            (_b = this.getRoom().LightGroup) === null || _b === void 0 ? void 0 : _b.switchAll(new models_1.ActuatorSetStateCommand(action, false, 'Presence Group LastLeftCallback'));
         });
-        this.addFirstEnterCallback(() => {
+        this.addFirstEnterCallback((action) => {
             if (!this.getRoom().settings.lampenBeiBewegung) {
                 return;
             }
             this.log(models_1.LogLevel.DeepTrace, `Bewegung im Raum ${this.roomName} festgestellt --> Licht einschalten`);
-            this.getRoom().setLightTimeBased(new models_1.RoomSetLightTimeBasedCommand(models_1.CommandSource.Automatic, true, 'Motion detected'));
-        });
-        this.getMotionDetector().forEach((b) => {
-            b.addMovementCallback((val) => {
-                this.motionSensorOnFirstEnter(val);
-            });
-        });
-        this.getMotionDetector().forEach((b) => {
-            b.addMovementCallback((val) => {
-                this.motionSensorOnLastLeft(val);
-            });
+            this.getRoom().setLightTimeBased(new models_1.RoomSetLightTimeBasedCommand(action, true));
         });
     }
+    addLastLeftCallback(cb) {
+        this._lastLeftCbs.push(cb);
+    }
     presentAmount() {
         let count = 0;
         for (let i = 0; i < this.getMotionDetector().length; i++) {
@@ -75,21 +62,31 @@ class PresenceGroup extends base_group_1.BaseGroup {
         }
         return false;
     }
-    addLastLeftCallback(cb) {
-        this._lastLeftCbs.push(cb);
-    }
     addFirstEnterCallback(cb) {
         this._firstEnterCbs.push(cb);
     }
-    motionSensorOnLastLeft(val) {
-        if (val || this.anyPresent()) {
+    motionSensorAnyMovement(action) {
+        var _a;
+        if (!action.motionDetected) {
+            return;
+        }
+        if (services_1.RoomService.awayModeActive || (services_1.RoomService.nightAlarmActive && !action.sensor.settings.excludeFromNightAlarm)) {
+            services_1.RoomService.startIntrusionAlarm(this.getRoom(), action.sensor);
+        }
+        if (!action.sensor.settings.seesWindow) {
+            (_a = this.getRoom().WindowGroup) === null || _a === void 0 ? void 0 : _a.changeVibrationMotionBlock(true);
+        }
+        services_1.RoomService.movementHistory.add(`${services_1.Utils.nowString()}: Raum "${this.roomName}" Gerät "${action.sensor.info.fullName}"`);
+    }
+    motionSensorOnLastLeft(action) {
+        if (action.motionDetected || this.anyPresent()) {
             this.resetLastLeftTimeout();
             return;
         }
         let timeAfterReset = services_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().settings.movementResetTimer * 1000;
         if (timeAfterReset > 0) {
             this.log(models_1.LogLevel.Debug, `Movement reset. Active Motions: ${this.presentAmount()}\tTime after Last Movement including Reset: ${timeAfterReset}`);
-            this.executeLastLeftCbs();
+            this.executeLastLeftCbs(new presenceGroupLastLeftAction_1.PresenceGroupLastLeftAction(action));
             return;
         }
         this.log(models_1.LogLevel.Debug, `Movement reset in ${this.roomName} delayed.`);
@@ -98,23 +95,22 @@ class PresenceGroup extends base_group_1.BaseGroup {
             timeAfterReset =
                 services_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().settings.movementResetTimer * 1000;
             const presentAmount = this.presentAmount();
-            this.log(models_1.LogLevel.Debug, `Delayed Movement reset. Active Motions: ${this.presentAmount()}\tTime after Last Movement including Reset: ${timeAfterReset}`);
+            this.log(models_1.LogLevel.Debug, `Delayed Movement reset. Active Motions: ${this.presentAmount()}\tTime after Last Movement including Reset: ${timeAfterReset}, action: ${action.reasonTrace}`);
             if (presentAmount <= 0 && timeAfterReset > 0) {
-                this.executeLastLeftCbs();
+                this.executeLastLeftCbs(new presenceGroupLastLeftAction_1.PresenceGroupLastLeftAction(action));
             }
         }, Math.abs(timeAfterReset) + 500, this);
     }
     /**
      * In case of an existing delayed last left callback timeout, this removes it.
-     * @private
      */
     resetLastLeftTimeout() {
         if (this._lastLeftTimeout !== null) {
             clearTimeout(this._lastLeftTimeout);
         }
     }
-    motionSensorOnFirstEnter(val) {
-        if (!val) {
+    motionSensorOnFirstEnter(action) {
+        if (!action.motionDetected) {
             return;
         }
         this._lastMovement = new Date();
@@ -122,12 +118,12 @@ class PresenceGroup extends base_group_1.BaseGroup {
             return;
         }
         for (const cb of this._firstEnterCbs) {
-            cb();
+            cb(new presenceGroupFirstEnterAction_1.PresenceGroupFirstEnterAction(action));
         }
     }
-    executeLastLeftCbs() {
+    executeLastLeftCbs(action) {
         for (const cb of this._lastLeftCbs) {
-            cb();
+            cb(action);
         }
     }
 }

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

@@ -25,42 +25,42 @@ class TasterGroup extends base_group_1.BaseGroup {
                     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`);
+            }, 'Close all Rollos in this room');
             (_b = t.buttonTopLeft) === null || _b === void 0 ? void 0 : _b.addCb(button_1.ButtonPressType.short, (pValue) => {
                 var _a;
                 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`);
+            }, '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.setDesiredPosition(new models_1.WindowSetDesiredPositionCommand(models_1.CommandSource.Manual, 100, 'Button Top Right pressed long'));
-            }, `Open all Rollos in this room`);
+            }, 'Open all Rollos in this room');
             (_d = t.buttonTopRight) === null || _d === void 0 ? void 0 : _d.addCb(button_1.ButtonPressType.short, (pValue) => {
                 var _a;
                 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`);
+            }, '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;
                 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`);
+            }, '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;
                 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`);
+            }, '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;
                 if (sonosGroup !== undefined && sonosGroup.getOwnSonosDevices().length > 0) {

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

@@ -3,7 +3,17 @@ import { Window } from './Window';
 import { BaseGroup } from './base-group';
 export declare class WindowGroup extends BaseGroup {
     windows: Window[];
+    /**
+     * Timecallback for sunrise-shutter actions
+     * @remarks This callback is only set if needed and already calculated.
+     * @warning Manual setting of this callback is not recommended. Prefer {@link recalcTimeCallbacks} after changing settings.
+     */
     sunriseShutterCallback: TimeCallback | undefined;
+    /**
+     * Timecallback for sunset-shutter actions
+     * @remarks This callback is only set if needed and already calculated.
+     * @warning Manual setting of this callback is not recommended. Prefer {@link recalcTimeCallbacks} after changing settings.
+     */
     sunsetShutterCallback: TimeCallback | undefined;
     constructor(roomName: string, windows: Window[]);
     setDesiredPosition(c: WindowSetDesiredPositionCommand): void;
@@ -11,7 +21,7 @@ export declare class WindowGroup extends BaseGroup {
     recalcTimeCallbacks(): void;
     setRolloByWeatherStatus(c: WindowSetRolloByWeatherStatusCommand): void;
     sunriseUp(c: ShutterSunriseUpCommand): void;
-    restoreRolloPosition(c: RoomRestoreShutterPositionCommand): void;
+    restoreShutterPosition(c: RoomRestoreShutterPositionCommand): void;
     changeVibrationMotionBlock(block: boolean): void;
     private sunsetDown;
     private reconfigureSunsetShutterCallback;

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

@@ -62,7 +62,7 @@ class WindowGroup extends base_group_1.BaseGroup {
                 return;
             }
             if (darkOutside) {
-                f.restoreDesiredPosition(new models_1.WindowRestoreDesiredPositionCommand(c, `It's dark outside.`));
+                f.restoreDesiredPosition(new models_1.WindowRestoreDesiredPositionCommand(c, "It's dark outside."));
                 return;
             }
             let desiredPos = f.desiredPosition;
@@ -79,14 +79,14 @@ class WindowGroup extends base_group_1.BaseGroup {
         });
     }
     sunriseUp(c) {
-        this.windows.forEach((f) => {
-            if (!this.getRoom().settings.sonnenAufgangRollos || f.getShutter().length === 0) {
+        this.windows.forEach((w) => {
+            if (!this.getRoom().settings.sonnenAufgangRollos || w.getShutter().length === 0) {
                 return;
             }
-            f.setDesiredPosition(new models_1.WindowSetDesiredPositionCommand(c, 100));
+            w.setDesiredPosition(new models_1.WindowSetDesiredPositionCommand(c, 100));
         });
     }
-    restoreRolloPosition(c) {
+    restoreShutterPosition(c) {
         if (!c.recalc) {
             this.windows.forEach((f) => {
                 f.restoreDesiredPosition(new models_1.WindowRestoreDesiredPositionCommand(c));
@@ -164,7 +164,7 @@ class WindowGroup extends base_group_1.BaseGroup {
         }
         if (this.sunriseShutterCallback === undefined) {
             this.log(models_1.LogLevel.Debug, `Add Sunrise shutter TimeCallback for ${this.roomName}`);
-            this.sunriseShutterCallback = new models_1.TimeCallback(`${this.roomName} Sonnenaufgang Rollos`, models_1.TimeCallbackType.Sunrise, () => {
+            this.sunriseShutterCallback = new models_1.TimeCallback(`${this.roomName} Sunrise Shutter`, models_1.TimeCallbackType.Sunrise, () => {
                 if (room.skipNextRolloUp) {
                     this.log(models_1.LogLevel.Info, `${this.roomName} skipped sunrise up due to room.skipNextRolloUp`);
                     room.skipNextRolloUp = false;

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

@@ -4,6 +4,7 @@ export declare class HmIpAccessPoint extends HmIPDevice {
     constructor(pInfo: IoBrokerDeviceInfo);
     private _ip;
     get ip(): string;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     private updateBaseInformation;
 }

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

@@ -12,6 +12,7 @@ class HmIpAccessPoint extends hmIpDevice_1.HmIPDevice {
     get ip() {
         return this._ip;
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `AP Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);

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

@@ -2,25 +2,29 @@ import { HmIPDevice } from './hmIpDevice';
 import { MotionSensorSettings } from '../../../models';
 import { iIlluminationSensor, iMotionSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
+import { MotionSensorAction } from '../../../models/action/motionSensorAction';
 export declare class HmIpBewegung extends HmIPDevice implements iIlluminationSensor, iMotionSensor {
     private static MOVEMENT_DETECTION;
     private static CURRENT_ILLUMINATION;
+    /** @inheritDoc */
     settings: MotionSensorSettings;
+    /** @inheritDoc */
     movementDetected: boolean;
+    /** @inheritDoc */
+    detectionsToday: number;
     private _movementDetectedCallback;
     private initialized;
     private _fallBackTimeout;
     private _lastMotionTime;
+    private _currentIllumination;
     constructor(pInfo: IoBrokerDeviceInfo);
+    /** @inheritDoc */
     get timeSinceLastMotion(): number;
-    private _detectionsToday;
-    get detectionsToday(): number;
-    set detectionsToday(pVal: number);
-    private _currentIllumination;
     get currentIllumination(): number;
     private set currentIllumination(value);
-    addMovementCallback(pCallback: (pValue: boolean) => void): void;
+    addMovementCallback(pCallback: (action: MotionSensorAction) => void): void;
     persistMotionSensor(): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     updateMovement(pVal: boolean): void;
     private resetFallbackTimeout;

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

@@ -6,16 +6,20 @@ const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
 const services_1 = require("../../services");
 const DeviceCapability_1 = require("../DeviceCapability");
+const motionSensorAction_1 = require("../../../models/action/motionSensorAction");
 class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         var _a;
         super(pInfo, deviceType_1.DeviceType.HmIpBewegung);
+        /** @inheritDoc */
         this.settings = new models_1.MotionSensorSettings();
+        /** @inheritDoc */
         this.movementDetected = false;
+        /** @inheritDoc */
+        this.detectionsToday = 0;
         this._movementDetectedCallback = [];
         this.initialized = false;
         this._lastMotionTime = 0;
-        this._detectionsToday = 0;
         this._currentIllumination = -1;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.motionSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.illuminationSensor);
@@ -33,15 +37,10 @@ class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
             });
         }
     }
+    /** @inheritDoc */
     get timeSinceLastMotion() {
         return Math.floor((services_1.Utils.nowMS() - this._lastMotionTime) / 1000);
     }
-    get detectionsToday() {
-        return this._detectionsToday;
-    }
-    set detectionsToday(pVal) {
-        this._detectionsToday = pVal;
-    }
     get currentIllumination() {
         return this._currentIllumination;
     }
@@ -57,6 +56,7 @@ class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistMotionSensor(this);
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Bewegungs Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
         super.update(idSplit, state, initial, true);
@@ -75,7 +75,7 @@ class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
     }
     updateMovement(pVal) {
         if (!this.initialized && pVal) {
-            this.log(models_1.LogLevel.Trace, `Bewegung erkannt aber die Initialisierung aus der DB ist noch nicht erfolgt --> verzögern`);
+            this.log(models_1.LogLevel.Trace, 'Bewegung erkannt aber die Initialisierung aus der DB ist noch nicht erfolgt --> verzögern');
             services_1.Utils.guardedTimeout(() => {
                 this.updateMovement(pVal);
             }, 1000, this);
@@ -100,18 +100,18 @@ class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
             this.log(models_1.LogLevel.Trace, `Dies ist die ${this.detectionsToday} Bewegung `);
         }
         for (const c of this._movementDetectedCallback) {
-            c(pVal);
+            c(new motionSensorAction_1.MotionSensorAction(this));
         }
     }
     resetFallbackTimeout() {
         if (this._fallBackTimeout) {
-            this.log(models_1.LogLevel.Trace, `Fallback Timeout zurücksetzen`);
+            this.log(models_1.LogLevel.Trace, 'Fallback Timeout zurücksetzen');
             clearTimeout(this._fallBackTimeout);
         }
     }
     startFallbackTimeout() {
         this._fallBackTimeout = services_1.Utils.guardedTimeout(() => {
-            this.log(models_1.LogLevel.Debug, `Benötige Fallback Bewegungs Reset `);
+            this.log(models_1.LogLevel.Debug, 'Benötige Fallback Bewegungs Reset ');
             this._fallBackTimeout = undefined;
             this.updateMovement(false);
         }, 270000, this);

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

@@ -2,8 +2,7 @@ import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
 import { DeviceType } from '../deviceType';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIPDevice extends IoBrokerBaseDevice {
-    lowBattery: boolean;
-    stateMap: Map<string, ioBroker.State>;
     constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
 }

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

@@ -6,9 +6,8 @@ const IoBrokerBaseDevice_1 = require("../IoBrokerBaseDevice");
 class HmIPDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     constructor(pInfo, pType) {
         super(pInfo, pType);
-        this.lowBattery = false;
-        this.stateMap = new Map();
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false, pOverride = false) {
         if (!pOverride) {
             this.log(models_1.LogLevel.Trace, `Keine Update Überschreibung :\n\tID: ${idSplit.join('.')}`);
@@ -20,7 +19,7 @@ class HmIPDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             case '0.LOW_BAT':
                 const newBatLowVal = state.val;
                 if (newBatLowVal) {
-                    this.log(models_1.LogLevel.Warn, `!!BATTERIE FAST LEER!!`);
+                    this.log(models_1.LogLevel.Warn, '!!BATTERIE FAST LEER!!');
                 }
                 break;
         }