hoffmation-base 3.0.0-alpha.5 → 3.0.0-alpha.50

package/lib/server/devices/zigbee/BaseDevices/zigbeeHeater.d.ts

@@ -1,17 +1,16 @@
 /// <reference types="node" />
 import { ZigbeeDevice } from './zigbeeDevice';
 import { iBatteryDevice, iHeater } from '../../baseDeviceInterfaces';
-import { HeaterSettings } from '../../../../models';
+import { BatteryLevelChangeAction, HeaterSettings } from '../../../../models';
 import { DeviceType } from '../../deviceType';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { PIDController } from '../../../../liquid-pid';
 export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater, iBatteryDevice {
-    protected _battery: number;
-    private _lastBatteryPersist;
-    get lastBatteryPersist(): number;
+    /** @inheritDoc */
     readonly persistHeaterInterval: NodeJS.Timeout;
+    /** @inheritDoc */
     settings: HeaterSettings;
-    get battery(): number;
+    protected _battery: number;
     protected _iAutomaticInterval: NodeJS.Timeout | undefined;
     protected _initialSeasonCheckDone: boolean;
     protected _level: number;
@@ -19,28 +18,50 @@ export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater, iBatt
     protected _temperatur: number;
     protected _desiredTemperatur: number;
     protected _pidController: PIDController;
-    constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
     protected _seasonTurnOff: boolean;
+    protected _roomTemperature: number;
+    private _lastBatteryPersist;
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
+    constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
+    /** @inheritDoc */
+    get lastBatteryPersist(): number;
+    /** @inheritDoc */
+    get battery(): number;
+    /** @inheritDoc */
     get seasonTurnOff(): boolean;
+    /** @inheritDoc */
     set seasonTurnOff(value: boolean);
+    /** @inheritDoc */
     get desiredTemperature(): number;
+    /** @inheritDoc */
     set desiredTemperature(val: number);
-    protected _humidity: number;
-    get humidity(): number;
     get sLevel(): string;
+    /** @inheritDoc */
     get iLevel(): number;
     get sTemperatur(): string;
+    /** @inheritDoc */
     get iTemperature(): number;
-    protected _roomTemperature: number;
+    /** @inheritDoc */
     get roomTemperature(): number;
-    set roomTemperatur(val: number);
+    protected set roomTemperatur(val: number);
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
+    /** @inheritDoc */
     checkAutomaticChange(): void;
-    stopAutomaticCheck(): void;
+    /** @inheritDoc */
     onTemperaturChange(newTemperatur: number): void;
     persistHeater(): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
-    protected getNextPidLevel(): number;
-    private checkSeasonTurnOff;
+    /** @inheritDoc */
     persistBatteryDevice(): void;
+    /** @inheritDoc */
     dispose(): void;
+    protected getNextPidLevel(): number;
+    private checkSeasonTurnOff;
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    private checkForBatteryChange;
 }

package/lib/server/devices/zigbee/BaseDevices/zigbeeHeater.js

@@ -8,20 +8,15 @@ const services_1 = require("../../../services");
 const DeviceCapability_1 = require("../../DeviceCapability");
 const liquid_pid_1 = require("../../../../liquid-pid");
 class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    get battery() {
-        return this._battery;
-    }
     constructor(pInfo, pType) {
         super(pInfo, pType);
-        this._battery = -99;
-        this._lastBatteryPersist = 0;
+        /** @inheritDoc */
         this.persistHeaterInterval = services_1.Utils.guardedInterval(() => {
             this.persistHeater();
         }, 5 * 60 * 1000, this, false);
+        /** @inheritDoc */
         this.settings = new models_1.HeaterSettings();
+        this._battery = -99;
         this._initialSeasonCheckDone = false;
         this._level = 0;
         this._setPointTemperaturID = '';
@@ -38,8 +33,10 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
             Kd: 9, // PID: Kd in 1/1000
         });
         this._seasonTurnOff = false;
-        this._humidity = 0;
         this._roomTemperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
+        this._lastBatteryPersist = 0;
+        this._lastBatteryLevel = -1;
+        this._batteryLevelCallbacks = [];
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.heater);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this._iAutomaticInterval = services_1.Utils.guardedInterval(this.checkAutomaticChange, 300000, this); // Alle 5 Minuten prüfen
@@ -47,15 +44,27 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
             this.checkSeasonTurnOff();
         }, 0, 2, 0));
     }
+    /** @inheritDoc */
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
+    /** @inheritDoc */
+    get battery() {
+        return this._battery;
+    }
+    /** @inheritDoc */
     get seasonTurnOff() {
         return this._seasonTurnOff;
     }
+    /** @inheritDoc */
     set seasonTurnOff(value) {
         this._seasonTurnOff = value;
     }
+    /** @inheritDoc */
     get desiredTemperature() {
         return this._desiredTemperatur;
     }
+    /** @inheritDoc */
     set desiredTemperature(val) {
         this._desiredTemperatur = val;
         this.setState(this._setPointTemperaturID, val, () => {
@@ -64,18 +73,17 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
             this.log(models_1.LogLevel.Error, `Temperaturänderung ergab Fehler ${err}.`);
         });
     }
-    get humidity() {
-        return this._humidity;
-    }
     get sLevel() {
         return `${this._level * 100}%`;
     }
+    /** @inheritDoc */
     get iLevel() {
         return this._level;
     }
     get sTemperatur() {
         return `${this.iTemperature}°C`;
     }
+    /** @inheritDoc */
     get iTemperature() {
         if (this.settings.useOwnTemperatur) {
             return this._temperatur;
@@ -84,12 +92,18 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
             return this._roomTemperature;
         }
     }
+    /** @inheritDoc */
     get roomTemperature() {
         return this._roomTemperature;
     }
     set roomTemperatur(val) {
         this._roomTemperature = val;
     }
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback) {
+        this._batteryLevelCallbacks.push(pCallback);
+    }
+    /** @inheritDoc */
     checkAutomaticChange() {
         var _a;
         if (!this._initialSeasonCheckDone) {
@@ -113,12 +127,7 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
             this.desiredTemperature = targetTemperature;
         }
     }
-    stopAutomaticCheck() {
-        if (this._iAutomaticInterval !== undefined) {
-            clearInterval(this._iAutomaticInterval);
-            this._iAutomaticInterval = undefined;
-        }
-    }
+    /** @inheritDoc */
     onTemperaturChange(newTemperatur) {
         this.roomTemperatur = newTemperatur;
     }
@@ -126,18 +135,41 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistHeater(this);
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false, pOverride = false) {
         switch (idSplit[3]) {
             case 'battery':
                 this._battery = state.val;
+                this.checkForBatteryChange();
                 this.persistBatteryDevice();
                 if (this._battery < 20) {
-                    this.log(models_1.LogLevel.Warn, `Das Zigbee Gerät hat unter 20% Batterie.`);
+                    this.log(models_1.LogLevel.Warn, 'Das Zigbee Gerät hat unter 20% Batterie.');
                 }
                 break;
         }
         super.update(idSplit, state, initial, pOverride);
     }
+    /** @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;
+    }
+    /** @inheritDoc */
+    dispose() {
+        if (this.persistHeaterInterval) {
+            clearInterval(this.persistHeaterInterval);
+        }
+        if (this._iAutomaticInterval) {
+            clearInterval(this._iAutomaticInterval);
+            this._iAutomaticInterval = undefined;
+        }
+        super.dispose();
+    }
     getNextPidLevel() {
         if (this.seasonTurnOff || this._roomTemperature < 0) {
             return 0;
@@ -155,24 +187,18 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         }
         this._initialSeasonCheckDone = true;
     }
-    persistBatteryDevice() {
-        var _a;
-        const now = services_1.Utils.nowMS();
-        if (this._lastBatteryPersist + 60000 > now) {
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    checkForBatteryChange() {
+        const newLevel = this.battery;
+        if (newLevel == -1 || newLevel == this._lastBatteryLevel) {
             return;
         }
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
-        this._lastBatteryPersist = now;
-    }
-    dispose() {
-        if (this.persistHeaterInterval) {
-            clearInterval(this.persistHeaterInterval);
-        }
-        if (this._iAutomaticInterval) {
-            clearInterval(this._iAutomaticInterval);
-            this._iAutomaticInterval = undefined;
+        for (const cb of this._batteryLevelCallbacks) {
+            cb(new models_1.BatteryLevelChangeAction(this));
         }
-        super.dispose();
+        this._lastBatteryLevel = newLevel;
     }
 }
 exports.ZigbeeHeater = ZigbeeHeater;

package/lib/server/devices/zigbee/BaseDevices/zigbeeLamp.d.ts

@@ -0,0 +1,16 @@
+import { ZigbeeActuator } from './ZigbeeActuator';
+import { iLamp, iTemporaryDisableAutomatic } from '../../baseDeviceInterfaces';
+import { LampSetLightCommand, LampSetTimeBasedCommand, LampToggleLightCommand } from '../../../../models';
+import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
+import { DeviceType } from '../../deviceType';
+export declare abstract class ZigbeeLamp extends ZigbeeActuator implements iLamp, iTemporaryDisableAutomatic {
+    constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
+    /** @inheritDoc */
+    update(idSplit: string[], state: ioBroker.State, initial?: boolean, handledByChildObject?: boolean): void;
+    /** @inheritDoc */
+    setTimeBased(c: LampSetTimeBasedCommand): void;
+    /** @inheritdoc */
+    setLight(c: LampSetLightCommand): void;
+    /** @inheritDoc */
+    toggleLight(c: LampToggleLightCommand): boolean;
+}

package/lib/server/devices/zigbee/BaseDevices/zigbeeLamp.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZigbeeLamp = void 0;
+const ZigbeeActuator_1 = require("./ZigbeeActuator");
+const models_1 = require("../../../../models");
+const sharedFunctions_1 = require("../../sharedFunctions");
+const DeviceCapability_1 = require("../../DeviceCapability");
+class ZigbeeLamp extends ZigbeeActuator_1.ZigbeeActuator {
+    constructor(pInfo, deviceType) {
+        super(pInfo, deviceType);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
+    }
+    /** @inheritDoc */
+    update(idSplit, state, initial = false, handledByChildObject = false) {
+        if (!handledByChildObject) {
+            this.log(models_1.LogLevel.DeepTrace, `Lamp Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        }
+        this.queuedValue = null;
+        this.log(models_1.LogLevel.DeepTrace, `Lamp Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        super.update(idSplit, state, initial, true);
+    }
+    /** @inheritDoc */
+    setTimeBased(c) {
+        sharedFunctions_1.LampUtils.setTimeBased(this, c);
+    }
+    /** @inheritdoc */
+    setLight(c) {
+        super.setActuator(c);
+    }
+    /** @inheritDoc */
+    toggleLight(c) {
+        return sharedFunctions_1.LampUtils.toggleLight(this, c);
+    }
+}
+exports.ZigbeeLamp = ZigbeeLamp;

package/lib/server/devices/zigbee/BaseDevices/zigbeeLedRGBCCT.d.ts

@@ -1,10 +1,10 @@
 import { DeviceType } from '../../deviceType';
-import { LampSetTimeBasedCommand, LedSetLightCommand, LedSettings } from '../../../../models';
+import { ActuatorSetStateCommand, LampSetTimeBasedCommand, LedSetLightCommand, LedSettings } from '../../../../models';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { iLedRgbCct } from '../../baseDeviceInterfaces/iLedRgbCct';
 import { ZigbeeDimmer } from './zigbeeDimmer';
 export declare abstract class ZigbeeLedRGBCCT extends ZigbeeDimmer implements iLedRgbCct {
-    static DEFAULT_COLOR_WARM: string;
+    /** @inheritDoc */
     settings: LedSettings;
     protected abstract readonly _stateIdColor: string;
     protected abstract readonly _stateIdColorTemp: string;
@@ -12,16 +12,17 @@ export declare abstract class ZigbeeLedRGBCCT extends ZigbeeDimmer implements iL
     protected abstract readonly _stateNameColorTemp: string;
     protected constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
     protected _color: string;
+    /** @inheritDoc */
     get color(): string;
     protected _colortemp: number;
+    /** @inheritDoc */
     get colortemp(): number;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
-    /**
-     * @inheritDoc
-     */
+    /** @inheritDoc */
     setTimeBased(c: LampSetTimeBasedCommand): void;
-    /**
-     * @inheritDoc
-     */
+    /** @inheritDoc */
+    setActuator(c: ActuatorSetStateCommand): void;
+    /** @inheritDoc */
     setLight(c: LedSetLightCommand): void;
 }

package/lib/server/devices/zigbee/BaseDevices/zigbeeLedRGBCCT.js

@@ -8,19 +8,23 @@ const services_1 = require("../../../services");
 class ZigbeeLedRGBCCT extends zigbeeDimmer_1.ZigbeeDimmer {
     constructor(pInfo, deviceType) {
         super(pInfo, deviceType);
+        /** @inheritDoc */
         this.settings = new models_1.LedSettings();
         this._color = '#fcba32';
         this._colortemp = 500;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.ledLamp);
         // this.effectID = `${this.info.fullID}.effect`;
     }
+    /** @inheritDoc */
     get color() {
         return this._color;
     }
+    /** @inheritDoc */
     get colortemp() {
         return this._colortemp;
     }
     // private effectID: string = '';
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `LED Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial);
@@ -35,36 +39,35 @@ class ZigbeeLedRGBCCT extends zigbeeDimmer_1.ZigbeeDimmer {
                 break;
         }
     }
-    /**
-     * @inheritDoc
-     */
+    /** @inheritDoc */
     setTimeBased(c) {
         this.setLight(models_1.LedSetLightCommand.byTimeBased(this.settings, c));
     }
-    /**
-     * @inheritDoc
-     */
+    /** @inheritDoc */
+    setActuator(c) {
+        this.setLight(new models_1.LedSetLightCommand(c, c.on, '', c.disableAutomaticCommand));
+    }
+    /** @inheritDoc */
     setLight(c) {
-        if (this._stateIdState === '') {
-            this.log(models_1.LogLevel.Error, `Keine State ID bekannt.`);
+        if (this._actuatorOnStateIdState === '') {
+            this.log(models_1.LogLevel.Error, 'Keine State ID bekannt.');
             return;
         }
         if (!this.ioConn) {
-            this.log(models_1.LogLevel.Error, `Keine Connection bekannt.`);
+            this.log(models_1.LogLevel.Error, 'Keine Connection bekannt.');
             return;
         }
         if (c.on && c.brightness === -1 && this.brightness < 10) {
             c.brightness = 10;
         }
+        super.setLight(c);
         const formattedColor = services_1.Utils.formatHex(c.color);
-        if (formattedColor !== null && c.on) {
+        if (formattedColor !== null && c.on && (c.color !== this.color || c.isForceAction)) {
             this.setState(this._stateIdColor, formattedColor);
         }
-        if (c.colorTemp > -1 && c.on) {
+        if (c.colorTemp > -1 && c.on && (c.colorTemp !== this.colortemp || c.isForceAction)) {
             this.setState(this._stateIdColorTemp, c.colorTemp);
         }
-        super.setLight(c);
     }
 }
 exports.ZigbeeLedRGBCCT = ZigbeeLedRGBCCT;
-ZigbeeLedRGBCCT.DEFAULT_COLOR_WARM = '#f2b200';

package/lib/server/devices/zigbee/BaseDevices/zigbeeMagnetContact.d.ts

@@ -1,25 +1,44 @@
 import { DeviceType } from '../../deviceType';
+import { BatteryLevelChangeAction } from '../../../../models';
 import { ZigbeeDevice } from './zigbeeDevice';
 import { MagnetPosition } from '../../models';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
-import { iBatteryDevice } from '../../baseDeviceInterfaces';
-export declare class ZigbeeMagnetContact extends ZigbeeDevice implements iBatteryDevice {
-    protected _battery: number;
-    private _lastBatteryPersist;
-    get lastBatteryPersist(): number;
-    get battery(): number;
+import { iBatteryDevice, iMagnetSensor } from '../../baseDeviceInterfaces';
+export declare class ZigbeeMagnetContact extends ZigbeeDevice implements iBatteryDevice, iMagnetSensor {
+    /** @inheritDoc */
     position: MagnetPosition;
+    /** @inheritDoc */
     telegramOnOpen: boolean;
+    /** @inheritDoc */
     speakOnOpen: boolean;
+    protected _battery: number;
+    private _lastBatteryPersist;
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
     private _closedCallback;
     private _openCallback;
     private _iOpenTimeout;
     private minutesOpen;
     constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
+    /** @inheritDoc */
+    get lastBatteryPersist(): number;
+    /** @inheritDoc */
+    get battery(): number;
+    /** @inheritDoc */
     addOpenCallback(pCallback: (pValue: boolean) => void): void;
+    /** @inheritDoc */
     addClosedCallback(pCallback: (pValue: boolean) => void): void;
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverrride?: boolean): void;
-    protected updatePosition(pValue: MagnetPosition): void;
+    /** @inheritDoc */
     dispose(): void;
+    /** @inheritDoc */
     persistBatteryDevice(): void;
+    protected updatePosition(pValue: MagnetPosition): void;
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    private checkForBatteryChange;
 }

package/lib/server/devices/zigbee/BaseDevices/zigbeeMagnetContact.js

@@ -6,41 +6,74 @@ const models_1 = require("../../../../models");
 const zigbeeDevice_1 = require("./zigbeeDevice");
 const models_2 = require("../../models");
 class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    get battery() {
-        return this._battery;
-    }
     constructor(pInfo, deviceType) {
         super(pInfo, deviceType);
-        this._battery = -99;
-        this._lastBatteryPersist = 0;
+        /** @inheritDoc */
         this.position = models_2.MagnetPosition.closed;
+        /** @inheritDoc */
         this.telegramOnOpen = false;
+        /** @inheritDoc */
         this.speakOnOpen = false;
+        this._battery = -99;
+        this._lastBatteryPersist = 0;
+        this._lastBatteryLevel = -1;
+        this._batteryLevelCallbacks = [];
         this._closedCallback = [];
         this._openCallback = [];
         this.minutesOpen = 0;
     }
+    /** @inheritDoc */
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
+    /** @inheritDoc */
+    get battery() {
+        return this._battery;
+    }
+    /** @inheritDoc */
     addOpenCallback(pCallback) {
         this._openCallback.push(pCallback);
     }
+    /** @inheritDoc */
     addClosedCallback(pCallback) {
         this._closedCallback.push(pCallback);
     }
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback) {
+        this._batteryLevelCallbacks.push(pCallback);
+    }
+    /** @inheritDoc */
     update(idSplit, state, initial = false, pOverrride = false) {
         super.update(idSplit, state, initial, pOverrride);
         switch (idSplit[3]) {
             case 'battery':
                 this._battery = state.val;
+                this.checkForBatteryChange();
                 this.persistBatteryDevice();
                 if (this._battery < 20) {
-                    this.log(models_1.LogLevel.Warn, `Das Zigbee Gerät hat unter 20% Batterie.`);
+                    this.log(models_1.LogLevel.Warn, 'Das Zigbee Gerät hat unter 20% Batterie.');
                 }
                 break;
         }
     }
+    /** @inheritDoc */
+    dispose() {
+        if (this._iOpenTimeout) {
+            clearInterval(this._iOpenTimeout);
+            this._iOpenTimeout = undefined;
+        }
+        super.dispose();
+    }
+    /** @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;
+    }
     updatePosition(pValue) {
         if (pValue === this.position) {
             return;
@@ -98,21 +131,18 @@ class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
             }, 60000, this);
         }
     }
-    dispose() {
-        if (this._iOpenTimeout) {
-            clearInterval(this._iOpenTimeout);
-            this._iOpenTimeout = undefined;
-        }
-        super.dispose();
-    }
-    persistBatteryDevice() {
-        var _a;
-        const now = services_1.Utils.nowMS();
-        if (this._lastBatteryPersist + 60000 > now) {
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    checkForBatteryChange() {
+        const newLevel = this.battery;
+        if (newLevel == -1 || newLevel == this._lastBatteryLevel) {
             return;
         }
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
-        this._lastBatteryPersist = now;
+        for (const cb of this._batteryLevelCallbacks) {
+            cb(new models_1.BatteryLevelChangeAction(this));
+        }
+        this._lastBatteryLevel = newLevel;
     }
 }
 exports.ZigbeeMagnetContact = ZigbeeMagnetContact;

package/lib/server/devices/zigbee/BaseDevices/zigbeeMotionSensor.d.ts

@@ -1,36 +1,52 @@
 /// <reference types="node" />
 import { DeviceType } from '../../deviceType';
 import { ZigbeeDevice } from './index';
-import { MotionSensorSettings } from '../../../../models';
+import { BatteryLevelChangeAction, MotionSensorAction, MotionSensorSettings } from '../../../../models';
 import { iBatteryDevice, iMotionSensor } from '../../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionSensor, iBatteryDevice {
+    /** @inheritDoc */
+    settings: MotionSensorSettings;
+    /** @inheritDoc */
+    detectionsToday: number;
+    protected _initialized: boolean;
+    protected _movementDetectedCallback: Array<(action: MotionSensorAction) => void>;
+    protected _needsMovementResetFallback: boolean;
+    protected _fallBackTimeout: NodeJS.Timeout | undefined;
+    protected _timeSinceLastMotion: number;
     private _movementDetected;
     private _battery;
     private _lastBatteryPersist;
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
+    constructor(pInfo: IoBrokerDeviceInfo, type: DeviceType);
+    /** @inheritDoc */
     get lastBatteryPersist(): number;
-    settings: MotionSensorSettings;
+    /** @inheritDoc */
     get movementDetected(): boolean;
+    /** @inheritDoc */
     get battery(): number;
-    protected _initialized: boolean;
-    protected _movementDetectedCallback: Array<(pValue: boolean) => void>;
-    protected _needsMovementResetFallback: boolean;
-    protected _fallBackTimeout: NodeJS.Timeout | undefined;
-    constructor(pInfo: IoBrokerDeviceInfo, type: DeviceType);
-    protected _timeSinceLastMotion: number;
+    /** @inheritDoc */
     get timeSinceLastMotion(): number;
-    protected _detectionsToday: number;
-    get detectionsToday(): number;
-    set detectionsToday(pVal: number);
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
     /**
      * Adds a callback for when a motion state has changed.
-     * @param pCallback Function that accepts the new state as parameter
+     * @param pCallback - Function that accepts the new state as parameter
      */
-    addMovementCallback(pCallback: (newState: boolean) => void): void;
+    /** @inheritDoc */
+    addMovementCallback(pCallback: (action: MotionSensorAction) => void): void;
+    /** @inheritDoc */
     persistMotionSensor(): void;
     updateMovement(newState: boolean): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
+    /** @inheritDoc */
+    persistBatteryDevice(): void;
     private resetFallbackTimeout;
     private startFallbackTimeout;
-    persistBatteryDevice(): void;
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    private checkForBatteryChange;
 }