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

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

@@ -7,29 +7,51 @@ import { HmIPDevice } from './hmIpDevice';
 import { iBatteryDevice, iHandleSensor } from '../baseDeviceInterfaces';
 import { HandleSettings } from '../../../models/deviceSettings/handleSettings';
 export declare class HmIpGriff extends HmIPDevice implements iHandleSensor, iBatteryDevice, iDisposable {
+    /** @inheritDoc */
     settings: HandleSettings;
+    /** @inheritDoc */
+    position: WindowPosition;
+    /** @inheritDoc */
+    minutesOpen: number;
     private _battery;
     private _lastBatteryPersist;
     private _lastHandlePersist;
-    get lastBatteryPersist(): number;
-    get battery(): number;
-    position: WindowPosition;
     private _kippCallback;
     private _closedCallback;
     private _offenCallback;
     private _iOpenTimeout;
-    minutesOpen: number;
     private _window;
     private _helpingRoomTemp;
+    /**
+     * Creates an instance of {@link DeviceType.HmIpGriff}.
+     * @param pInfo - Device creation information
+     */
     constructor(pInfo: IoBrokerDeviceInfo);
+    /** @inheritDoc */
+    get lastBatteryPersist(): number;
+    /** @inheritDoc */
+    get battery(): number;
+    /**
+     * Adds a window to this device
+     */
     set window(value: Window);
+    /** @inheritDoc */
     addOffenCallback(pCallback: (pValue: boolean) => void): void;
+    /** @inheritDoc */
     addKippCallback(pCallback: (pValue: boolean) => void): void;
+    /** @inheritDoc */
     addClosedCallback(pCallback: (pValue: boolean) => void): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
-    updatePosition(pValue: WindowPosition): void;
+    /** @inheritDoc */
     persistBatteryDevice(): void;
+    /**
+     * Persists the handle sensor state to the persistence layer
+     */
     persistHandleSensor(): void;
+    /** @inheritDoc */
     dispose(): void;
+    /** @inheritDoc */
     toJSON(): Partial<IoBrokerBaseDevice>;
+    private updatePosition;
 }

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

@@ -13,40 +13,56 @@ const hmIpDevice_1 = require("./hmIpDevice");
 const DeviceCapability_1 = require("../DeviceCapability");
 const handleSettings_1 = require("../../../models/deviceSettings/handleSettings");
 class HmIpGriff extends hmIpDevice_1.HmIPDevice {
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    get battery() {
-        return this._battery;
-    }
+    /**
+     * Creates an instance of {@link DeviceType.HmIpGriff}.
+     * @param pInfo - Device creation information
+     */
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpGriff);
+        /** @inheritDoc */
         this.settings = new handleSettings_1.HandleSettings();
+        /** @inheritDoc */
+        this.position = models_1.WindowPosition.geschlossen;
+        /** @inheritDoc */
+        this.minutesOpen = 0;
         this._battery = -99;
         this._lastBatteryPersist = 0;
         this._lastHandlePersist = 0;
-        this.position = models_1.WindowPosition.geschlossen;
         this._kippCallback = [];
         this._closedCallback = [];
         this._offenCallback = [];
-        this.minutesOpen = 0;
         this._window = undefined;
         this._helpingRoomTemp = false;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.handleSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
     }
+    /** @inheritDoc */
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
+    /** @inheritDoc */
+    get battery() {
+        return this._battery;
+    }
+    /**
+     * Adds a window to this device
+     */
     set window(value) {
         this._window = value;
     }
+    /** @inheritDoc */
     addOffenCallback(pCallback) {
         this._offenCallback.push(pCallback);
     }
+    /** @inheritDoc */
     addKippCallback(pCallback) {
         this._kippCallback.push(pCallback);
     }
+    /** @inheritDoc */
     addClosedCallback(pCallback) {
         this._closedCallback.push(pCallback);
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_2.LogLevel.DeepTrace, `Griff Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
         super.update(idSplit, state, initial, true);
@@ -72,6 +88,40 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
                 break;
         }
     }
+    /** @inheritDoc */
+    persistBatteryDevice() {
+        var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastBatteryPersist + 60000 > now) {
+            return;
+        }
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+        this._lastBatteryPersist = now;
+    }
+    /**
+     * Persists the handle sensor state to the persistence layer
+     */
+    persistHandleSensor() {
+        var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastHandlePersist + 2000 > now) {
+            return;
+        }
+        this.log(models_2.LogLevel.Debug, `Persist handle state: ${this.position}`);
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistHandleSensor(this);
+        this._lastHandlePersist = now;
+    }
+    /** @inheritDoc */
+    dispose() {
+        if (this._iOpenTimeout) {
+            clearInterval(this._iOpenTimeout);
+            this._iOpenTimeout = undefined;
+        }
+    }
+    /** @inheritDoc */
+    toJSON() {
+        return lodash_1.default.omit(super.toJSON(), ['_window']);
+    }
     updatePosition(pValue) {
         if (pValue === this.position) {
             if (this._lastHandlePersist == 0) {
@@ -116,7 +166,7 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
                     const wouldHelp = (desiredTemp < currentTemp && outSideTemp < currentTemp) ||
                         (desiredTemp > currentTemp && outSideTemp > currentTemp);
                     if (!wouldHelp && this._helpingRoomTemp) {
-                        const info = `Window should be closed, as it doesn't help reaching target temperature.`;
+                        const info = "Window should be closed, as it doesn't help reaching target temperature.";
                         this.log(models_2.LogLevel.Info, info);
                         if (this.settings.informNotHelping) {
                             services_1.TelegramService.inform(info);
@@ -155,33 +205,5 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
             }
         }, 60000, this);
     }
-    persistBatteryDevice() {
-        var _a;
-        const now = services_1.Utils.nowMS();
-        if (this._lastBatteryPersist + 60000 > now) {
-            return;
-        }
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
-        this._lastBatteryPersist = now;
-    }
-    persistHandleSensor() {
-        var _a;
-        const now = services_1.Utils.nowMS();
-        if (this._lastHandlePersist + 2000 > now) {
-            return;
-        }
-        this.log(models_2.LogLevel.Debug, `Persist handle state: ${this.position}`);
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistHandleSensor(this);
-        this._lastHandlePersist = now;
-    }
-    dispose() {
-        if (this._iOpenTimeout) {
-            clearInterval(this._iOpenTimeout);
-            this._iOpenTimeout = undefined;
-        }
-    }
-    toJSON() {
-        return lodash_1.default.omit(super.toJSON(), ['_window']);
-    }
 }
 exports.HmIpGriff = HmIpGriff;

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

@@ -4,10 +4,16 @@ 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;
+    /** @inheritDoc */
     readonly persistTemperatureSensorInterval: NodeJS.Timeout;
+    /** @inheritDoc */
     readonly persistHumiditySensorInterval: NodeJS.Timeout;
+    /** @inheritDoc */
     settings: HeaterSettings;
     private _iAutomaticInterval;
     private _initialSeasonCheckDone;
@@ -17,35 +23,51 @@ export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSe
     private _temperatureCallbacks;
     constructor(pInfo: IoBrokerDeviceInfo);
     protected _seasonTurnOff: boolean;
+    /** @inheritDoc */
     get seasonTurnOff(): boolean;
+    /** @inheritDoc */
     set seasonTurnOff(value: boolean);
     private _temperature;
     get temperature(): number;
     private set temperature(value);
     private _humidity;
+    /** @inheritDoc */
     get humidity(): number;
     private set humidity(value);
     private _desiredTemperature;
+    /** @inheritDoc */
     get desiredTemperature(): number;
+    /** @inheritDoc */
     set desiredTemperature(val: number);
     get sLevel(): string;
+    /** @inheritDoc */
     get iLevel(): number;
+    /** @inheritDoc */
     get sTemperature(): string;
+    /** @inheritDoc */
     get iTemperature(): number;
     private _roomTemperature;
+    /** @inheritDoc */
     get roomTemperature(): number;
-    set roomTemperature(value: number);
-    addHumidityCallback(pCallback: (pValue: number) => void): void;
+    /** @inheritDoc */
+    addHumidityCallback(pCallback: (action: HumiditySensorChangeAction) => void): void;
     getBelongingHeizungen(): iHeater[];
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
-    stopAutomaticCheck(): void;
+    /** @inheritDoc */
     checkAutomaticChange(): void;
-    addTempChangeCallback(pCallback: (pValue: number) => void): void;
+    /** @inheritDoc */
+    addTempChangeCallback(pCallback: (action: TemperatureSensorChangeAction) => void): void;
+    /** @inheritDoc */
     onTemperaturChange(newTemperatur: number): void;
+    /** @inheritDoc */
     persistTemperaturSensor(): void;
+    /** @inheritDoc */
     persistHeater(): void;
+    /** @inheritDoc */
     persistHumiditySensor(): void;
     private updateBaseInformation;
     private checkSeasonTurnOff;
+    /** @inheritDoc */
     dispose(): void;
 }

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

@@ -8,18 +8,24 @@ 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);
+        /** @inheritDoc */
         this.persistHeaterInterval = services_1.Utils.guardedInterval(() => {
             this.persistHeater();
         }, 5 * 60 * 1000, this, false);
+        /** @inheritDoc */
         this.persistTemperatureSensorInterval = services_1.Utils.guardedInterval(() => {
             this.persistTemperaturSensor();
         }, 5 * 60 * 1000, this, false);
+        /** @inheritDoc */
         this.persistHumiditySensorInterval = services_1.Utils.guardedInterval(() => {
             this.persistHumiditySensor();
         }, 5 * 60 * 1000, this, false);
+        /** @inheritDoc */
         this.settings = new models_1.HeaterSettings();
         this._initialSeasonCheckDone = false;
         this._level = 0;
@@ -40,9 +46,11 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
             this.checkSeasonTurnOff();
         }, 0, 2, 0));
     }
+    /** @inheritDoc */
     get seasonTurnOff() {
         return this._seasonTurnOff;
     }
+    /** @inheritDoc */
     set seasonTurnOff(value) {
         this._seasonTurnOff = value;
         if (value) {
@@ -61,21 +69,24 @@ 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 */
     get humidity() {
         return this._humidity;
     }
     set humidity(val) {
         this._humidity = val;
         for (const cb of this._humidityCallbacks) {
-            cb(val);
+            cb(new humiditySensorChangeAction_1.HumiditySensorChangeAction(this, val));
         }
     }
+    /** @inheritDoc */
     get desiredTemperature() {
         return this._desiredTemperature;
     }
+    /** @inheritDoc */
     set desiredTemperature(val) {
         this.setState(this._setPointTemperatureID, this.seasonTurnOff ? 5 : val, () => {
             this.log(models_1.LogLevel.Info, `Changed temperature of to "${val}.`);
@@ -86,30 +97,33 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     get sLevel() {
         return `${this._level * 100}%`;
     }
+    /** @inheritDoc */
     get iLevel() {
         return this._level;
     }
+    /** @inheritDoc */
     get sTemperature() {
         return `${this.temperature}°C`;
     }
+    /** @inheritDoc */
     get iTemperature() {
         return this.temperature;
     }
+    /** @inheritDoc */
     get roomTemperature() {
         return this._roomTemperature;
     }
-    set roomTemperature(value) {
-        this._roomTemperature = value;
-    }
+    /** @inheritDoc */
     addHumidityCallback(pCallback) {
         this._humidityCallbacks.push(pCallback);
         if (this._humidity > 0) {
-            pCallback(this._humidity);
+            pCallback(new humiditySensorChangeAction_1.HumiditySensorChangeAction(this, this._humidity));
         }
     }
     getBelongingHeizungen() {
         return this.room.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Heater);
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Heizgruppe Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
@@ -119,12 +133,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
                 break;
         }
     }
-    stopAutomaticCheck() {
-        if (this._iAutomaticInterval !== undefined) {
-            clearInterval(this._iAutomaticInterval);
-            this._iAutomaticInterval = undefined;
-        }
-    }
+    /** @inheritDoc */
     checkAutomaticChange() {
         var _a, _b, _c, _d;
         if (!this._initialSeasonCheckDone) {
@@ -144,23 +153,28 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
             this.desiredTemperature = targetTemp;
         }
     }
+    /** @inheritDoc */
     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 */
     onTemperaturChange(newTemperatur) {
-        this.roomTemperature = newTemperatur;
+        this._roomTemperature = newTemperatur;
     }
+    /** @inheritDoc */
     persistTemperaturSensor() {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistTemperatureSensor(this);
     }
+    /** @inheritDoc */
     persistHeater() {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistHeater(this);
     }
+    /** @inheritDoc */
     persistHumiditySensor() {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistHumiditySensor(this);
@@ -190,6 +204,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         }
         this._initialSeasonCheckDone = true;
     }
+    /** @inheritDoc */
     dispose() {
         if (this.persistTemperatureSensorInterval) {
             clearInterval(this.persistTemperatureSensorInterval);

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

@@ -14,6 +14,7 @@ export declare class HmIpHeizung extends HmIPDevice implements iBatteryDevice {
     get desiredTemperatur(): number;
     get iLevel(): number;
     get iTemperatur(): number;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     private updateBaseInformation;
     persistBatteryDevice(): void;

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

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

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

@@ -4,15 +4,21 @@ import { iLamp, iTemporaryDisableAutomatic } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { BlockAutomaticHandler } from '../../services/blockAutomaticHandler';
 export declare class HmIpLampe extends HmIPDevice implements iLamp, iTemporaryDisableAutomatic {
+    /** @inheritDoc */
     lightOn: boolean;
+    /** @inheritDoc */
     settings: ActuatorSettings;
     private lightOnSwitchID;
+    /** @inheritDoc */
     readonly blockAutomationHandler: BlockAutomaticHandler;
+    /** @inheritDoc */
     queuedValue: boolean | null;
+    /** @inheritDoc */
     targetAutomaticState: boolean;
     constructor(pInfo: IoBrokerDeviceInfo);
     get actuatorOn(): boolean;
     restoreTargetAutomaticValue(c: RestoreTargetAutomaticValueCommand): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     setActuator(command: ActuatorSetStateCommand): void;
     toggleActuator(c: ActuatorToggleCommand): boolean;

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

@@ -11,10 +11,14 @@ const sharedFunctions_1 = require("../sharedFunctions");
 class HmIpLampe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpLampe);
+        /** @inheritDoc */
         this.lightOn = false;
+        /** @inheritDoc */
         this.settings = new models_1.ActuatorSettings();
         this.lightOnSwitchID = '';
+        /** @inheritDoc */
         this.queuedValue = null;
+        /** @inheritDoc */
         this.targetAutomaticState = false;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.blockAutomatic);
@@ -25,9 +29,9 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
         return this.lightOn;
     }
     restoreTargetAutomaticValue(c) {
-        this.log(models_1.LogLevel.Debug, c.logMessage);
-        this.setLight(new models_1.LampSetLightCommand(c, this.targetAutomaticState, 'Lampen RestoreTargetAutomaticValue'));
+        this.setLight(new models_1.LampSetLightCommand(c, this.targetAutomaticState));
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Lampen Update : ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         this.queuedValue = null;
@@ -52,7 +56,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
     /** @inheritdoc */
     setLight(c) {
         if (this.lightOnSwitchID === '') {
-            this.log(models_1.LogLevel.Error, `Keine Switch ID bekannt.`);
+            this.log(models_1.LogLevel.Error, 'Keine Switch ID bekannt.');
             return;
         }
         sharedFunctions_1.LampUtils.setActuator(this, c);

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

@@ -2,28 +2,31 @@ import { HmIPDevice } from './hmIpDevice';
 import { MotionSensorSettings } from '../../../models';
 import { iBatteryDevice, iIlluminationSensor, iMotionSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
+import { MotionSensorAction } from '../../../models/action/motionSensorAction';
 export declare class HmIpPraezenz extends HmIPDevice implements iIlluminationSensor, iBatteryDevice, iMotionSensor {
-    private _battery;
-    private _lastBatteryPersist;
-    get lastBatteryPersist(): number;
     private static PRESENCE_DETECTION;
     private static CURRENT_ILLUMINATION;
-    excludeFromNightAlarm: boolean;
+    /** @inheritDoc */
     movementDetected: boolean;
-    get battery(): number;
+    /** @inheritDoc */
     settings: MotionSensorSettings;
+    private _battery;
+    private _lastBatteryPersist;
     private _movementDetectedCallback;
     private initialized;
     private _lastMotionTime;
+    private _detectionsToday;
+    private _currentIllumination;
     constructor(pInfo: IoBrokerDeviceInfo);
+    get lastBatteryPersist(): number;
+    get battery(): number;
     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;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     updatePresence(pVal: boolean): void;
     persistMotionSensor(): void;

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

@@ -6,21 +6,17 @@ 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 HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    get battery() {
-        return this._battery;
-    }
     constructor(pInfo) {
         var _a;
         super(pInfo, deviceType_1.DeviceType.HmIpPraezenz);
-        this._battery = -99;
-        this._lastBatteryPersist = 0;
-        this.excludeFromNightAlarm = false;
+        /** @inheritDoc */
         this.movementDetected = false;
+        /** @inheritDoc */
         this.settings = new models_1.MotionSensorSettings();
+        this._battery = -99;
+        this._lastBatteryPersist = 0;
         this._movementDetectedCallback = [];
         // private presenceStateID: string;
         this.initialized = false;
@@ -45,6 +41,12 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
             });
         }
     }
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
+    get battery() {
+        return this._battery;
+    }
     get timeSinceLastMotion() {
         return Math.floor((services_1.Utils.nowMS() - this._lastMotionTime) / 1000);
     }
@@ -65,6 +67,7 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
     addMovementCallback(pCallback) {
         this._movementDetectedCallback.push(pCallback);
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Präzens Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
         super.update(idSplit, state, initial, true);
@@ -91,7 +94,7 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
     }
     updatePresence(pVal) {
         if (!this.initialized && pVal) {
-            this.log(models_1.LogLevel.Debug, `Präsenz erkannt aber die Initialisierung aus der DB ist noch nicht erfolgt --> verzögern`);
+            this.log(models_1.LogLevel.Debug, 'Präsenz erkannt aber die Initialisierung aus der DB ist noch nicht erfolgt --> verzögern');
             services_1.Utils.guardedTimeout(() => {
                 this.updatePresence(pVal);
             }, 1000, this);
@@ -110,7 +113,7 @@ class HmIpPraezenz 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));
         }
     }
     persistMotionSensor() {

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

@@ -5,6 +5,7 @@ import { iShutter } from '../baseDeviceInterfaces';
 import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpRoll extends HmIPDevice implements iShutter {
+    /** @inheritDoc */
     settings: ShutterSettings;
     private _setLevelSwitchID;
     private _firstCommandRecieved;
@@ -19,6 +20,7 @@ export declare class HmIpRoll extends HmIPDevice implements iShutter {
     set window(value: Window | undefined);
     get desiredWindowShutterLevel(): number;
     persist(): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     setLevel(command: ShutterSetLevelCommand): void;
     toJSON(): Partial<IoBrokerBaseDevice>;