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

package/lib/models/command/lightGroupSwitchTimeConditionalCommand.js

@@ -14,7 +14,7 @@ class LightGroupSwitchTimeConditionalCommand extends baseCommand_1.BaseCommand {
         super(source, reason);
         this.time = time;
         /** @inheritDoc */
-        this._commandType = commandType_1.CommandType.LightGroupSwitchTimeConditional;
+        this.type = commandType_1.CommandType.LightGroupSwitchTimeConditional;
     }
 }
 exports.LightGroupSwitchTimeConditionalCommand = LightGroupSwitchTimeConditionalCommand;

package/lib/models/command/restoreTargetAutomaticValueCommand.d.ts

@@ -3,7 +3,7 @@ import { CommandSource } from './commandSource';
 import { CommandType } from './commandType';
 export declare class RestoreTargetAutomaticValueCommand extends BaseCommand {
     /** @inheritDoc */
-    _commandType: CommandType;
+    type: CommandType;
     /**
      * Command to restore the target automatic value of an actuator
      * @param source - The source of the command

package/lib/models/command/restoreTargetAutomaticValueCommand.js

@@ -12,7 +12,7 @@ class RestoreTargetAutomaticValueCommand extends baseCommand_1.BaseCommand {
     constructor(source, reason = '') {
         super(source, reason);
         /** @inheritDoc */
-        this._commandType = commandType_1.CommandType.ActuatorRestoreTargetAutomaticValueCommand;
+        this.type = commandType_1.CommandType.ActuatorRestoreTargetAutomaticValueCommand;
     }
 }
 exports.RestoreTargetAutomaticValueCommand = RestoreTargetAutomaticValueCommand;

package/lib/models/command/roomRestoreLightCommand.d.ts

@@ -3,7 +3,7 @@ import { CommandType } from './commandType';
 import { CommandSource } from './commandSource';
 export declare class RoomRestoreLightCommand extends BaseCommand {
     /** @inheritDoc */
-    _commandType: CommandType;
+    type: CommandType;
     /**
      * Command to restore the normal automatic light-state of a room
      * @param source - The source of the command

package/lib/models/command/roomRestoreLightCommand.js

@@ -12,7 +12,7 @@ class RoomRestoreLightCommand extends baseCommand_1.BaseCommand {
     constructor(source, reason = '') {
         super(source, reason);
         /** @inheritDoc */
-        this._commandType = commandType_1.CommandType.RoomRestoreLightCommand;
+        this.type = commandType_1.CommandType.RoomRestoreLightCommand;
     }
 }
 exports.RoomRestoreLightCommand = RoomRestoreLightCommand;

package/lib/models/command/roomRestoreShutterPositionCommand.d.ts

@@ -4,7 +4,7 @@ import { CommandType } from './commandType';
 export declare class RoomRestoreShutterPositionCommand extends BaseCommand {
     readonly recalc: boolean;
     /** @inheritDoc */
-    _commandType: CommandType;
+    type: CommandType;
     /**
      * Command to restore the normal automatic shutter position of a room
      * @param source - The source of the command

package/lib/models/command/roomRestoreShutterPositionCommand.js

@@ -14,7 +14,7 @@ class RoomRestoreShutterPositionCommand extends baseCommand_1.BaseCommand {
         super(source, reason);
         this.recalc = recalc;
         /** @inheritDoc */
-        this._commandType = commandType_1.CommandType.RoomRestoreShutterPositionCommand;
+        this.type = commandType_1.CommandType.RoomRestoreShutterPositionCommand;
     }
 }
 exports.RoomRestoreShutterPositionCommand = RoomRestoreShutterPositionCommand;

package/lib/models/command/roomSetLightTimeBasedCommand.d.ts

@@ -4,7 +4,7 @@ import { CommandSource } from './commandSource';
 export declare class RoomSetLightTimeBasedCommand extends BaseCommand {
     readonly movementDependant: boolean;
     /** @inheritDoc */
-    _commandType: CommandType;
+    type: CommandType;
     /**
      * Sets the light based on the current time, rollo Position and room Settings
      * @param source - The source of the command

package/lib/models/command/roomSetLightTimeBasedCommand.js

@@ -14,7 +14,7 @@ class RoomSetLightTimeBasedCommand extends baseCommand_1.BaseCommand {
         super(source, reason);
         this.movementDependant = movementDependant;
         /** @inheritDoc */
-        this._commandType = commandType_1.CommandType.RoomSetLightTimeBasedCommand;
+        this.type = commandType_1.CommandType.RoomSetLightTimeBasedCommand;
     }
 }
 exports.RoomSetLightTimeBasedCommand = RoomSetLightTimeBasedCommand;

package/lib/models/command/shutterSunriseUpCommand.d.ts

@@ -3,7 +3,7 @@ import { CommandSource } from './commandSource';
 import { CommandType } from './commandType';
 export declare class ShutterSunriseUpCommand extends BaseCommand {
     /** @inheritDoc */
-    _commandType: CommandType;
+    type: CommandType;
     /**
      * Command to perform actions when the shutter should be opened due to sunrise
      * @param source - The source of the command

package/lib/models/command/shutterSunriseUpCommand.js

@@ -12,7 +12,7 @@ class ShutterSunriseUpCommand extends baseCommand_1.BaseCommand {
     constructor(source, reason = '') {
         super(source, reason);
         /** @inheritDoc */
-        this._commandType = commandType_1.CommandType.ShutterSunriseUpCommand;
+        this.type = commandType_1.CommandType.ShutterSunriseUpCommand;
     }
 }
 exports.ShutterSunriseUpCommand = ShutterSunriseUpCommand;

package/lib/models/command/shutterSunsetDownCommand.d.ts

@@ -3,7 +3,7 @@ import { CommandSource } from './commandSource';
 import { CommandType } from './commandType';
 export declare class ShutterSunsetDownCommand extends BaseCommand {
     /** @inheritDoc */
-    _commandType: CommandType;
+    type: CommandType;
     /**
      * Command to perform actions when the shutter is closing due to sunset
      * @param source - The source of the command

package/lib/models/command/shutterSunsetDownCommand.js

@@ -12,7 +12,7 @@ class ShutterSunsetDownCommand extends baseCommand_1.BaseCommand {
     constructor(source, reason = '') {
         super(source, reason);
         /** @inheritDoc */
-        this._commandType = commandType_1.CommandType.SunsetDownCommand;
+        this.type = commandType_1.CommandType.SunsetDownCommand;
     }
 }
 exports.ShutterSunsetDownCommand = ShutterSunsetDownCommand;

package/lib/models/command/wledSetLightCommand.d.ts

@@ -8,7 +8,7 @@ import { BlockAutomaticCommand } from './blockAutomaticCommand';
 export declare class WledSetLightCommand extends DimmerSetLightCommand {
     preset?: number | undefined;
     /** @inheritDoc */
-    _commandType: CommandType;
+    type: CommandType;
     /**
      * Command to set the light state of a WLED device
      * @param source - The source of the command

package/lib/models/command/wledSetLightCommand.js

@@ -20,7 +20,7 @@ class WledSetLightCommand extends dimmerSetLightCommand_1.DimmerSetLightCommand
         super(source, on, reason, disableAutomatic, brightness, transitionTime);
         this.preset = preset;
         /** @inheritDoc */
-        this._commandType = commandType_1.CommandType.WledSetLightCommand;
+        this.type = commandType_1.CommandType.WledSetLightCommand;
     }
     get logMessage() {
         var _a;

package/lib/models/index.d.ts

@@ -1,3 +1,4 @@
+export * from './action/index';
 export * from './rooms/index';
 export * from './deviceSettings/index';
 export * from './persistence/index';

package/lib/models/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BlockAutomaticSettings = void 0;
+__exportStar(require("./action/index"), exports);
 __exportStar(require("./rooms/index"), exports);
 __exportStar(require("./deviceSettings/index"), exports);
 __exportStar(require("./persistence/index"), exports);

package/lib/server/devices/baseDeviceInterfaces/iHumiditySensor.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 import { iRoomDevice } from './iRoomDevice';
+import { HumiditySensorChangeAction } from '../../../models/action/humiditySensorChangeAction';
 export declare const UNDEFINED_HUMIDITY_VALUE = -1;
 /**
  * This interface represents a humidity sensor device.
@@ -20,7 +21,7 @@ export interface iHumiditySensor extends iRoomDevice {
      * Add a callback that is called when the humidity changes
      * @param pCallback - The callback to fire
      */
-    addHumidityCallback(pCallback: (pValue: number) => void): void;
+    addHumidityCallback(pCallback: (action: HumiditySensorChangeAction) => void): void;
     /**
      * Persists the current humidity information to the database
      */

package/lib/server/devices/baseDeviceInterfaces/iMotionSensor.d.ts

@@ -1,5 +1,6 @@
 import { MotionSensorSettings } from '../../../models';
 import { iRoomDevice } from './iRoomDevice';
+import { MotionSensorAction } from '../../../models/action/motionSensorAction';
 /**
  * This interface represents a motion sensor device.
  *
@@ -26,7 +27,7 @@ export interface iMotionSensor extends iRoomDevice {
      * Adds a callback for when a motion state has changed.
      * @param pCallback - Function that accepts the new state as parameter
      */
-    addMovementCallback(pCallback: (newState: boolean) => void): void;
+    addMovementCallback(pCallback: (action: MotionSensorAction) => void): void;
     /**
      * Persists the current motion information to the database
      */

package/lib/server/devices/baseDeviceInterfaces/iShutter.d.ts

@@ -14,7 +14,7 @@ export interface iShutter extends iRoomDevice {
     /**
      * The current level of the shutter (0 = closed, 100 = open)
      */
-    currentLevel: number;
+    readonly currentLevel: number;
     /**
      * The desired level of the shutter for this window (this might be different from the current level due to the desired level being set by the user)
      */

package/lib/server/devices/baseDeviceInterfaces/iTemperatureSensor.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" />
 import { iRoomDevice } from './iRoomDevice';
+import { TemperatureSensorChangeAction } from '../../../models/action/temperatureSensorChangeAction';
 export declare const UNDEFINED_TEMP_VALUE = -99;
 /**
  * This interface represents a temperature sensor device.
@@ -28,7 +29,7 @@ export interface iTemperatureSensor extends iRoomDevice {
      * Adds a callback to be called when the temperature changes
      * @param pCallback - The callback to be called
      */
-    addTempChangeCallback(pCallback: (pValue: number) => void): void;
+    addTempChangeCallback(pCallback: (action: TemperatureSensorChangeAction) => void): void;
     /**
      * Inform the temperature sensor that the temperature in the room has changed
      * @param newTemperatur - The new temperature in the room in Celsius

package/lib/server/devices/blueIris/cameraDevice.d.ts

@@ -4,6 +4,7 @@ import { LogDebugType } from '../../services';
 import { DeviceInfo } from '../DeviceInfo';
 import { DeviceCapability } from '../DeviceCapability';
 import { DeviceType } from '../deviceType';
+import { MotionSensorAction } from '../../../models/action/motionSensorAction';
 export declare class CameraDevice implements iCameraDevice {
     /**
      * The name of the camera in BlueIris
@@ -66,7 +67,7 @@ export declare class CameraDevice implements iCameraDevice {
     /** @inheritDoc */
     get room(): RoomBase | undefined;
     /** @inheritDoc */
-    addMovementCallback(pCallback: (newState: boolean) => void): void;
+    addMovementCallback(pCallback: (action: MotionSensorAction) => void): void;
     /** @inheritDoc */
     blockForDevice(device: iBaseDevice, block: boolean): void;
     /** @inheritDoc */

package/lib/server/devices/blueIris/cameraDevice.js

@@ -13,6 +13,7 @@ const DeviceInfo_1 = require("../DeviceInfo");
 const DeviceCapability_1 = require("../DeviceCapability");
 const deviceType_1 = require("../deviceType");
 const ioBroker_1 = require("../../ioBroker");
+const motionSensorAction_1 = require("../../../models/action/motionSensorAction");
 class CameraDevice {
     constructor(mqttName, roomName, blueIrisName) {
         var _a;
@@ -237,7 +238,7 @@ class CameraDevice {
             this.log(models_1.LogLevel.Trace, `This is movement no. ${this.detectionsToday}`);
         }
         for (const c of this._movementDetectedCallback) {
-            c(newState);
+            c(new motionSensorAction_1.MotionSensorAction(this));
         }
     }
     resetPersonDetectFallbackTimer() {

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

@@ -5,6 +5,7 @@ import { DeviceCapability } from '../DeviceCapability';
 import { DeviceType } from '../deviceType';
 import { DeviceInfo } from '../DeviceInfo';
 import { DeviceSettings, LogLevel, RoomBase } from '../../../models';
+import { TemperatureSensorChangeAction } from '../../../models/action/temperatureSensorChangeAction';
 export declare class DachsTemperatureSensor implements iTemperatureSensor {
     /** @inheritDoc */
     settings: DeviceSettings | undefined;
@@ -39,7 +40,7 @@ export declare class DachsTemperatureSensor implements iTemperatureSensor {
     private set temperature(value);
     update(newTemp: number): void;
     /** @inheritDoc */
-    addTempChangeCallback(pCallback: (pValue: number) => void): void;
+    addTempChangeCallback(pCallback: (action: TemperatureSensorChangeAction) => void): void;
     /** @inheritDoc */
     onTemperaturChange(newTemperatur: number): void;
     /** @inheritDoc */

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

@@ -11,6 +11,7 @@ const deviceType_1 = require("../deviceType");
 const DeviceInfo_1 = require("../DeviceInfo");
 const devices_1 = require("../devices");
 const lodash_1 = __importDefault(require("lodash"));
+const temperatureSensorChangeAction_1 = require("../../../models/action/temperatureSensorChangeAction");
 class DachsTemperatureSensor {
     constructor(roomName, shortKey, longKey) {
         /** @inheritDoc */
@@ -76,7 +77,7 @@ class DachsTemperatureSensor {
     set temperature(val) {
         this._temperature = val;
         for (const cb of this._temperaturCallbacks) {
-            cb(val);
+            cb(new temperatureSensorChangeAction_1.TemperatureSensorChangeAction(this, val));
         }
     }
     update(newTemp) {
@@ -86,7 +87,7 @@ class DachsTemperatureSensor {
     addTempChangeCallback(pCallback) {
         this._temperaturCallbacks.push(pCallback);
         if (this._temperature > baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
-            pCallback(this._temperature);
+            pCallback(new temperatureSensorChangeAction_1.TemperatureSensorChangeAction(this, this._temperature));
         }
     }
     /** @inheritDoc */

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

@@ -4,6 +4,7 @@ import { WindowRestoreDesiredPositionCommand, WindowSetDesiredPositionCommand }
 import { iShutter, iVibrationSensor } from '../baseDeviceInterfaces';
 import { BaseGroup } from './base-group';
 import { ZigbeeMagnetContact } from '../zigbee';
+import { ShutterPositionChangedAction } from '../../../models/action/shutterPositionChangedAction';
 export declare class Window extends BaseGroup {
     readonly handleIds: string[];
     readonly vibrationIds: string[];
@@ -27,6 +28,6 @@ export declare class Window extends BaseGroup {
     getVibration(): iVibrationSensor[];
     griffeInPosition(pPosition: WindowPosition): number;
     initialize(): void;
-    rolloPositionChange(pValue: number): void;
+    rolloPositionChange(action: ShutterPositionChangedAction): void;
     restoreDesiredPosition(c: WindowRestoreDesiredPositionCommand): void;
 }

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

@@ -104,10 +104,10 @@ class Window extends base_group_1.BaseGroup {
             });
         }, 5, this);
     }
-    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(new models_2.RoomSetLightTimeBasedCommand(models_2.CommandSource.Automatic, true, 'Window.rolloPositionChange'));
+    rolloPositionChange(action) {
+        this.log(models_2.LogLevel.Debug, `Rollo Position Change in ${this.roomName}: ${action.reasonTrace}`, action.newPosition == this._desiredPosition ? services_1.LogDebugType.None : services_1.LogDebugType.ShutterPositionChange);
+        if (action.newPosition === 0 || action.newPosition === 100) {
+            this.getRoom().setLightTimeBased(new models_2.RoomSetLightTimeBasedCommand(action, true));
         }
     }
     restoreDesiredPosition(c) {

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,10 +10,11 @@ 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.

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,9 +95,9 @@ 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);
     }
@@ -112,8 +109,8 @@ class PresenceGroup extends base_group_1.BaseGroup {
             clearTimeout(this._lastLeftTimeout);
         }
     }
-    motionSensorOnFirstEnter(val) {
-        if (!val) {
+    motionSensorOnFirstEnter(action) {
+        if (!action.motionDetected) {
             return;
         }
         this._lastMovement = new Date();
@@ -121,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/hmIPDevices/hmIpBewegung.d.ts

@@ -2,6 +2,7 @@ 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;
@@ -21,7 +22,7 @@ export declare class HmIpBewegung extends HmIPDevice implements iIlluminationSen
     get timeSinceLastMotion(): number;
     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;

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

@@ -6,6 +6,7 @@ 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;
@@ -99,7 +100,7 @@ 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() {

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

@@ -4,6 +4,8 @@ import { iDisposable } from '../../services';
 import { HeaterSettings } from '../../../models';
 import { iHeater, iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
+import { HumiditySensorChangeAction } from '../../../models/action/humiditySensorChangeAction';
+import { TemperatureSensorChangeAction } from '../../../models/action/temperatureSensorChangeAction';
 export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSensor, iHumiditySensor, iHeater, iDisposable {
     /** @inheritDoc */
     readonly persistHeaterInterval: NodeJS.Timeout;
@@ -48,14 +50,14 @@ export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSe
     /** @inheritDoc */
     get roomTemperature(): number;
     /** @inheritDoc */
-    addHumidityCallback(pCallback: (pValue: number) => void): void;
+    addHumidityCallback(pCallback: (action: HumiditySensorChangeAction) => void): void;
     getBelongingHeizungen(): iHeater[];
     /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     /** @inheritDoc */
     checkAutomaticChange(): void;
     /** @inheritDoc */
-    addTempChangeCallback(pCallback: (pValue: number) => void): void;
+    addTempChangeCallback(pCallback: (action: TemperatureSensorChangeAction) => void): void;
     /** @inheritDoc */
     onTemperaturChange(newTemperatur: number): void;
     /** @inheritDoc */

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

@@ -8,6 +8,8 @@ const models_1 = require("../../../models");
 const baseDeviceInterfaces_1 = require("../baseDeviceInterfaces");
 const device_cluster_type_1 = require("../device-cluster-type");
 const DeviceCapability_1 = require("../DeviceCapability");
+const humiditySensorChangeAction_1 = require("../../../models/action/humiditySensorChangeAction");
+const temperatureSensorChangeAction_1 = require("../../../models/action/temperatureSensorChangeAction");
 class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpHeizgruppe);
@@ -67,7 +69,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     set temperature(val) {
         this._temperature = val;
         for (const cb of this._temperatureCallbacks) {
-            cb(val);
+            cb(new temperatureSensorChangeAction_1.TemperatureSensorChangeAction(this, val));
         }
     }
     /** @inheritDoc */
@@ -77,7 +79,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     set humidity(val) {
         this._humidity = val;
         for (const cb of this._humidityCallbacks) {
-            cb(val);
+            cb(new humiditySensorChangeAction_1.HumiditySensorChangeAction(this, val));
         }
     }
     /** @inheritDoc */
@@ -115,7 +117,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     addHumidityCallback(pCallback) {
         this._humidityCallbacks.push(pCallback);
         if (this._humidity > 0) {
-            pCallback(this._humidity);
+            pCallback(new humiditySensorChangeAction_1.HumiditySensorChangeAction(this, this._humidity));
         }
     }
     getBelongingHeizungen() {
@@ -155,7 +157,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     addTempChangeCallback(pCallback) {
         this._temperatureCallbacks.push(pCallback);
         if (this._temperature > baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
-            pCallback(this._temperature);
+            pCallback(new temperatureSensorChangeAction_1.TemperatureSensorChangeAction(this, this._temperature));
         }
     }
     /** @inheritDoc */