hoffmation-base 3.0.0-alpha.40 → 3.0.0-alpha.42

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

@@ -8,16 +8,8 @@ const models_1 = require("../../../models");
 const DeviceCapability_1 = require("../DeviceCapability");
 const services_1 = require("../../services");
 class HmIpTaster extends hmIpDevice_1.HmIPDevice {
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    get battery() {
-        return this._battery;
-    }
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpTaster);
-        this._battery = -99;
-        this._lastBatteryPersist = 0;
         /**
          * Not present for HM-IP-Taster
          * @inheritDoc
@@ -28,6 +20,10 @@ class HmIpTaster extends hmIpDevice_1.HmIPDevice {
          * @inheritDoc
          */
         this.buttonTop = undefined;
+        this._battery = -99;
+        this._lastBatteryPersist = 0;
+        this._lastBatteryLevel = -1;
+        this._batteryLevelCallbacks = [];
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.buttonSwitch);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this.buttonTopLeft = new button_1.Button('TopLeft', HmIpTaster.BUTTON_CAPABILLITIES);
@@ -37,6 +33,16 @@ class HmIpTaster extends hmIpDevice_1.HmIPDevice {
         this.buttonMidRight = new button_1.Button('MidRight', HmIpTaster.BUTTON_CAPABILLITIES);
         this.buttonBotRight = new button_1.Button('BotRight', HmIpTaster.BUTTON_CAPABILLITIES);
     }
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
+    get battery() {
+        return this._battery;
+    }
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback) {
+        this._batteryLevelCallbacks.push(pCallback);
+    }
     persist(buttonName, pressType) {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistSwitchInput(this, pressType, buttonName);
@@ -51,6 +57,7 @@ class HmIpTaster extends hmIpDevice_1.HmIPDevice {
                 switch (idSplit[4]) {
                     case 'OPERATING_VOLTAGE':
                         this._battery = 100 * ((state.val - 1.8) / 1.2);
+                        this.checkForBatteryChange();
                         this.persistBatteryDevice();
                         break;
                 }
@@ -170,6 +177,19 @@ class HmIpTaster extends hmIpDevice_1.HmIPDevice {
         }
         return result;
     }
+    /**
+     * 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;
+        }
+        for (const cb of this._batteryLevelCallbacks) {
+            cb(new models_1.BatteryLevelChangeAction(this));
+        }
+        this._lastBatteryLevel = newLevel;
+    }
 }
 exports.HmIpTaster = HmIpTaster;
 HmIpTaster.BUTTON_CAPABILLITIES = {

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

@@ -1,13 +1,22 @@
 import { HmIPDevice } from './hmIpDevice';
+import { BatteryLevelChangeAction } from '../../../models';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { iBatteryDevice } from '../baseDeviceInterfaces';
 export declare class HmIpTherm extends HmIPDevice implements iBatteryDevice {
     private _battery;
     private _lastBatteryPersist;
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
+    constructor(pInfo: IoBrokerDeviceInfo);
     get lastBatteryPersist(): number;
     get battery(): number;
-    constructor(pInfo: IoBrokerDeviceInfo);
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
     /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     persistBatteryDevice(): void;
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    private checkForBatteryChange;
 }

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

@@ -7,17 +7,23 @@ const models_1 = require("../../../models");
 const DeviceCapability_1 = require("../DeviceCapability");
 const services_1 = require("../../services");
 class HmIpTherm extends hmIpDevice_1.HmIPDevice {
+    constructor(pInfo) {
+        super(pInfo, deviceType_1.DeviceType.HmIpTherm);
+        this._battery = -99;
+        this._lastBatteryPersist = 0;
+        this._lastBatteryLevel = -1;
+        this._batteryLevelCallbacks = [];
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
+    }
     get lastBatteryPersist() {
         return this._lastBatteryPersist;
     }
     get battery() {
         return this._battery;
     }
-    constructor(pInfo) {
-        super(pInfo, deviceType_1.DeviceType.HmIpTherm);
-        this._battery = -99;
-        this._lastBatteryPersist = 0;
-        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback) {
+        this._batteryLevelCallbacks.push(pCallback);
     }
     /** @inheritDoc */
     update(idSplit, state, initial = false) {
@@ -28,6 +34,7 @@ class HmIpTherm extends hmIpDevice_1.HmIPDevice {
                 switch (idSplit[4]) {
                     case 'OPERATING_VOLTAGE':
                         this._battery = 100 * ((state.val - 1.8) / 1.2);
+                        this.checkForBatteryChange();
                         this.persistBatteryDevice();
                         break;
                 }
@@ -43,5 +50,18 @@ class HmIpTherm extends hmIpDevice_1.HmIPDevice {
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
         this._lastBatteryPersist = 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;
+        }
+        for (const cb of this._batteryLevelCallbacks) {
+            cb(new models_1.BatteryLevelChangeAction(this));
+        }
+        this._lastBatteryLevel = newLevel;
+    }
 }
 exports.HmIpTherm = HmIpTherm;

package/lib/server/devices/shelly/shellyTrv.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { ShellyDevice } from './shellyDevice';
 import { iBatteryDevice, iHeater } from '../baseDeviceInterfaces';
-import { HeaterSettings } from '../../../models';
+import { BatteryLevelChangeAction, HeaterSettings } from '../../../models';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ShellyTrv extends ShellyDevice implements iHeater, iBatteryDevice {
     /** @inheritDoc */
@@ -30,6 +30,8 @@ export declare class ShellyTrv extends ShellyDevice implements iHeater, iBattery
     private readonly _setEnableExternalTempId;
     private readonly _setPointTemperaturID;
     private readonly _valvePosId;
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
     constructor(pInfo: IoBrokerDeviceInfo);
     /** @inheritDoc */
     get lastBatteryPersist(): number;
@@ -52,6 +54,8 @@ export declare class ShellyTrv extends ShellyDevice implements iHeater, iBattery
     get roomTemperature(): number;
     private set roomTemperatur(value);
     /** @inheritDoc */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
+    /** @inheritDoc */
     checkAutomaticChange(): void;
     /** @inheritDoc */
     onTemperaturChange(newTemperatur: number): void;
@@ -71,4 +75,8 @@ export declare class ShellyTrv extends ShellyDevice implements iHeater, iBattery
     private setExternalTemperatureEnabled;
     private setValve;
     private setMinimumLevel;
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    private checkForBatteryChange;
 }

package/lib/server/devices/shelly/shellyTrv.js

@@ -41,6 +41,8 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
             Kd: 9, // PID: Kd in 1/1000
         });
         this._lastBatteryPersist = 0;
+        this._lastBatteryLevel = -1;
+        this._batteryLevelCallbacks = [];
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.heater);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this._setAutomaticModeId = `${this.info.fullID}.tmp.automaticTemperatureControl`;
@@ -123,6 +125,10 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         }
     }
     /** @inheritDoc */
+    addBatteryLevelCallback(pCallback) {
+        this._batteryLevelCallbacks.push(pCallback);
+    }
+    /** @inheritDoc */
     checkAutomaticChange() {
         var _a;
         if (!this._initialSeasonCheckDone) {
@@ -194,6 +200,7 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         }
         else if (idSplit[3] === 'bat' && idSplit[4] === 'value') {
             this._battery = state.val;
+            this.checkForBatteryChange();
             this.persistBatteryDevice();
             if (this._battery < 20) {
                 this.log(models_1.LogLevel.Warn, 'Das Shelly Gerät hat unter 20% Batterie.');
@@ -275,5 +282,18 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
     setMinimumLevel(pidForcedMinimum) {
         this.setState(this._minumumLevelId, pidForcedMinimum);
     }
+    /**
+     * 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;
+        }
+        for (const cb of this._batteryLevelCallbacks) {
+            cb(new models_1.BatteryLevelChangeAction(this));
+        }
+        this._lastBatteryLevel = newLevel;
+    }
 }
 exports.ShellyTrv = ShellyTrv;

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

@@ -1,21 +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;
-    /** @inheritDoc */
-    get lastBatteryPersist(): number;
     /** @inheritDoc */
     readonly persistHeaterInterval: NodeJS.Timeout;
     /** @inheritDoc */
     settings: HeaterSettings;
-    /** @inheritDoc */
-    get battery(): number;
+    protected _battery: number;
     protected _iAutomaticInterval: NodeJS.Timeout | undefined;
     protected _initialSeasonCheckDone: boolean;
     protected _level: number;
@@ -23,8 +18,16 @@ 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 */
@@ -39,21 +42,26 @@ export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater, iBatt
     get sTemperatur(): string;
     /** @inheritDoc */
     get iTemperature(): number;
-    protected _roomTemperature: number;
     /** @inheritDoc */
     get roomTemperature(): number;
     protected set roomTemperatur(val: number);
     /** @inheritDoc */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
+    /** @inheritDoc */
     checkAutomaticChange(): 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,24 +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 {
-    /** @inheritDoc */
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    /** @inheritDoc */
-    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 = '';
@@ -43,6 +34,9 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         });
         this._seasonTurnOff = false;
         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
@@ -51,6 +45,14 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         }, 0, 2, 0));
     }
     /** @inheritDoc */
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
+    /** @inheritDoc */
+    get battery() {
+        return this._battery;
+    }
+    /** @inheritDoc */
     get seasonTurnOff() {
         return this._seasonTurnOff;
     }
@@ -98,6 +100,10 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         this._roomTemperature = val;
     }
     /** @inheritDoc */
+    addBatteryLevelCallback(pCallback) {
+        this._batteryLevelCallbacks.push(pCallback);
+    }
+    /** @inheritDoc */
     checkAutomaticChange() {
         var _a;
         if (!this._initialSeasonCheckDone) {
@@ -134,6 +140,7 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         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.');
@@ -142,23 +149,6 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         }
         super.update(idSplit, state, initial, pOverride);
     }
-    getNextPidLevel() {
-        if (this.seasonTurnOff || this._roomTemperature < 0) {
-            return 0;
-        }
-        this._pidController.setPoint(this.desiredTemperature);
-        const newValue = this._pidController.calculate(this._roomTemperature);
-        this.log(models_1.LogLevel.Debug, `New PID Value ${newValue}% (cTemp: ${this._roomTemperature}, dTemp: ${this.desiredTemperature})`);
-        return newValue;
-    }
-    checkSeasonTurnOff() {
-        const desiredState = services_1.Utils.beetweenDays(new Date(), this.settings.seasonTurnOffDay, this.settings.seasonTurnOnDay);
-        if (desiredState !== this.seasonTurnOff || !this._initialSeasonCheckDone) {
-            this.log(models_1.LogLevel.Info, `Switching Seasonal Heating --> New seasonTurnOff: ${desiredState}`);
-            this.seasonTurnOff = desiredState;
-        }
-        this._initialSeasonCheckDone = true;
-    }
     /** @inheritDoc */
     persistBatteryDevice() {
         var _a;
@@ -180,5 +170,35 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         }
         super.dispose();
     }
+    getNextPidLevel() {
+        if (this.seasonTurnOff || this._roomTemperature < 0) {
+            return 0;
+        }
+        this._pidController.setPoint(this.desiredTemperature);
+        const newValue = this._pidController.calculate(this._roomTemperature);
+        this.log(models_1.LogLevel.Debug, `New PID Value ${newValue}% (cTemp: ${this._roomTemperature}, dTemp: ${this.desiredTemperature})`);
+        return newValue;
+    }
+    checkSeasonTurnOff() {
+        const desiredState = services_1.Utils.beetweenDays(new Date(), this.settings.seasonTurnOffDay, this.settings.seasonTurnOnDay);
+        if (desiredState !== this.seasonTurnOff || !this._initialSeasonCheckDone) {
+            this.log(models_1.LogLevel.Info, `Switching Seasonal Heating --> New seasonTurnOff: ${desiredState}`);
+            this.seasonTurnOff = desiredState;
+        }
+        this._initialSeasonCheckDone = true;
+    }
+    /**
+     * 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;
+        }
+        for (const cb of this._batteryLevelCallbacks) {
+            cb(new models_1.BatteryLevelChangeAction(this));
+        }
+        this._lastBatteryLevel = newLevel;
+    }
 }
 exports.ZigbeeHeater = ZigbeeHeater;

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

@@ -1,35 +1,44 @@
 import { DeviceType } from '../../deviceType';
+import { BatteryLevelChangeAction } from '../../../../models';
 import { ZigbeeDevice } from './zigbeeDevice';
 import { MagnetPosition } from '../../models';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { iBatteryDevice, iMagnetSensor } from '../../baseDeviceInterfaces';
 export declare class ZigbeeMagnetContact extends ZigbeeDevice implements iBatteryDevice, iMagnetSensor {
-    protected _battery: number;
-    private _lastBatteryPersist;
-    /** @inheritDoc */
-    get lastBatteryPersist(): number;
-    /** @inheritDoc */
-    get battery(): number;
     /** @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,29 +6,31 @@ const models_1 = require("../../../../models");
 const zigbeeDevice_1 = require("./zigbeeDevice");
 const models_2 = require("../../models");
 class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
-    /** @inheritDoc */
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    /** @inheritDoc */
-    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);
     }
@@ -37,11 +39,16 @@ class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
         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.');
@@ -49,6 +56,24 @@ class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
                 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;
@@ -106,23 +131,18 @@ class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
             }, 60000, this);
         }
     }
-    /** @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) {
+    /**
+     * 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,7 +1,7 @@
 /// <reference types="node" />
 import { DeviceType } from '../../deviceType';
 import { ZigbeeDevice } from './index';
-import { MotionSensorAction, 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 {
@@ -17,6 +17,8 @@ export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionS
     private _movementDetected;
     private _battery;
     private _lastBatteryPersist;
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
     constructor(pInfo: IoBrokerDeviceInfo, type: DeviceType);
     /** @inheritDoc */
     get lastBatteryPersist(): number;
@@ -26,6 +28,8 @@ export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionS
     get battery(): number;
     /** @inheritDoc */
     get timeSinceLastMotion(): 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
@@ -41,4 +45,8 @@ export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionS
     persistBatteryDevice(): void;
     private resetFallbackTimeout;
     private startFallbackTimeout;
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    private checkForBatteryChange;
 }