hoffmation-base 3.0.0-alpha.89 → 3.0.0-alpha.90

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

@@ -1,10 +1,13 @@
 import { ZigbeeDevice } from './zigbeeDevice';
 import { iBatteryDevice, iHeater } from '../../baseDeviceInterfaces';
-import { BatteryLevelChangeAction, HeaterSettings } from '../../../../models';
+import { HeaterSettings } from '../../../../models';
 import { DeviceType } from '../../deviceType';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { PIDController } from '../../../../liquid-pid';
+import { Battery } from '../../sharedFunctions';
 export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater, iBatteryDevice {
+    /** @inheritDoc */
+    readonly battery: Battery;
     /** @inheritDoc */
     readonly persistHeaterInterval: NodeJS.Timeout;
     /** @inheritDoc */
@@ -19,14 +22,9 @@ export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater, iBatt
     protected _pidController: PIDController;
     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;
+    get batteryLevel(): number;
     /** @inheritDoc */
     get seasonTurnOff(): boolean;
     /** @inheritDoc */
@@ -45,8 +43,6 @@ export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater, iBatt
     get roomTemperature(): number;
     protected set roomTemperatur(val: number);
     /** @inheritDoc */
-    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
-    /** @inheritDoc */
     checkAutomaticChange(): void;
     /** @inheritDoc */
     onTemperaturChange(newTemperatur: number): void;
@@ -54,13 +50,7 @@ export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater, iBatt
     /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
     /** @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

@@ -7,10 +7,13 @@ const models_1 = require("../../../../models");
 const services_1 = require("../../../services");
 const DeviceCapability_1 = require("../../DeviceCapability");
 const liquid_pid_1 = require("../../../../liquid-pid");
+const sharedFunctions_1 = require("../../sharedFunctions");
 class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, pType) {
         super(pInfo, pType);
         /** @inheritDoc */
+        this.battery = new sharedFunctions_1.Battery(this);
+        /** @inheritDoc */
         this.persistHeaterInterval = services_1.Utils.guardedInterval(() => {
             this.persistHeater();
         }, 5 * 60 * 1000, this, false);
@@ -34,9 +37,6 @@ 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
@@ -45,12 +45,8 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         }, 0, 2, 0));
     }
     /** @inheritDoc */
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    /** @inheritDoc */
-    get battery() {
-        return this._battery;
+    get batteryLevel() {
+        return this.battery.level;
     }
     /** @inheritDoc */
     get seasonTurnOff() {
@@ -100,10 +96,6 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         this._roomTemperature = val;
     }
     /** @inheritDoc */
-    addBatteryLevelCallback(pCallback) {
-        this._batteryLevelCallbacks.push(pCallback);
-    }
-    /** @inheritDoc */
     checkAutomaticChange() {
         var _a;
         if (!this._initialSeasonCheckDone) {
@@ -139,10 +131,8 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
     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.battery.level = state.val;
+                if (this.batteryLevel < 20) {
                     this.log(models_1.LogLevel.Warn, 'Das Zigbee Gerät hat unter 20% Batterie.');
                 }
                 break;
@@ -150,16 +140,6 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         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);
@@ -187,18 +167,5 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         }
         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,10 +1,12 @@
 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';
+import { Battery } from '../../sharedFunctions';
 export declare class ZigbeeMagnetContact extends ZigbeeDevice implements iBatteryDevice, iMagnetSensor {
+    /** @inheritDoc */
+    readonly battery: Battery;
     /** @inheritDoc */
     position: MagnetPosition;
     /** @inheritDoc */
@@ -12,33 +14,20 @@ export declare class ZigbeeMagnetContact extends ZigbeeDevice implements iBatter
     /** @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;
+    get batteryLevel(): 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;
     /** @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

@@ -5,30 +5,26 @@ const services_1 = require("../../../services");
 const models_1 = require("../../../../models");
 const zigbeeDevice_1 = require("./zigbeeDevice");
 const models_2 = require("../../models");
+const sharedFunctions_1 = require("../../sharedFunctions");
 class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, deviceType) {
         super(pInfo, deviceType);
         /** @inheritDoc */
+        this.battery = new sharedFunctions_1.Battery(this);
+        /** @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;
+    get batteryLevel() {
+        return this.battery.level;
     }
     /** @inheritDoc */
     addOpenCallback(pCallback) {
@@ -39,18 +35,12 @@ 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.battery.level = state.val;
+                if (this.batteryLevel < 20) {
                     this.log(models_1.LogLevel.Warn, 'Das Zigbee Gerät hat unter 20% Batterie.');
                 }
                 break;
@@ -64,16 +54,6 @@ class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
         }
         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;
@@ -131,18 +111,5 @@ class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
             }, 60000, this);
         }
     }
-    /**
-     * 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.ZigbeeMagnetContact = ZigbeeMagnetContact;

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

@@ -1,9 +1,12 @@
 import { DeviceType } from '../../deviceType';
 import { ZigbeeDevice } from './index';
-import { BatteryLevelChangeAction, MotionSensorAction, MotionSensorSettings } from '../../../../models';
+import { MotionSensorAction, MotionSensorSettings } from '../../../../models';
 import { iBatteryDevice, iMotionSensor } from '../../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
+import { Battery } from '../../sharedFunctions';
 export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionSensor, iBatteryDevice {
+    /** @inheritDoc */
+    readonly battery: Battery;
     /** @inheritDoc */
     settings: MotionSensorSettings;
     /** @inheritDoc */
@@ -14,21 +17,13 @@ export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionS
     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;
-    /** @inheritDoc */
     get movementDetected(): boolean;
     /** @inheritDoc */
-    get battery(): number;
+    get batteryLevel(): 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
@@ -40,12 +35,6 @@ export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionS
     updateMovement(newState: boolean): void;
     /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
-    /** @inheritDoc */
-    persistBatteryDevice(): void;
     private resetFallbackTimeout;
     private startFallbackTimeout;
-    /**
-     * Checks whether the battery level did change and if so fires the callbacks
-     */
-    private checkForBatteryChange;
 }

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

@@ -5,11 +5,14 @@ const index_1 = require("./index");
 const models_1 = require("../../../../models");
 const services_1 = require("../../../services");
 const DeviceCapability_1 = require("../../DeviceCapability");
+const sharedFunctions_1 = require("../../sharedFunctions");
 class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
     constructor(pInfo, type) {
         var _a;
         super(pInfo, type);
         /** @inheritDoc */
+        this.battery = new sharedFunctions_1.Battery(this);
+        /** @inheritDoc */
         this.settings = new models_1.MotionSensorSettings();
         /** @inheritDoc */
         this.detectionsToday = 0;
@@ -18,10 +21,6 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
         this._needsMovementResetFallback = true;
         this._timeSinceLastMotion = 0;
         this._movementDetected = false;
-        this._battery = -99;
-        this._lastBatteryPersist = 0;
-        this._lastBatteryLevel = -1;
-        this._batteryLevelCallbacks = [];
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.motionSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         if (!services_1.Utils.anyDboActive) {
@@ -40,10 +39,6 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
         }
     }
     /** @inheritDoc */
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    /** @inheritDoc */
     get movementDetected() {
         if (!this.available) {
             // If the device is not available, there is no active movement
@@ -56,18 +51,14 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
         return this._movementDetected;
     }
     /** @inheritDoc */
-    get battery() {
-        return this._battery;
+    get batteryLevel() {
+        return this.battery.level;
     }
     // Time since last motion in seconds
     /** @inheritDoc */
     get timeSinceLastMotion() {
         return this._timeSinceLastMotion;
     }
-    /** @inheritDoc */
-    addBatteryLevelCallback(pCallback) {
-        this._batteryLevelCallbacks.push(pCallback);
-    }
     /**
      * Adds a callback for when a motion state has changed.
      * @param pCallback - Function that accepts the new state as parameter
@@ -117,10 +108,8 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
         super.update(idSplit, state, initial, pOverride);
         switch (idSplit[3]) {
             case 'battery':
-                this._battery = state.val;
-                this.checkForBatteryChange();
-                this.persistBatteryDevice();
-                if (this._battery < 20) {
+                this.battery.level = state.val;
+                if (this.batteryLevel < 20) {
                     this.log(models_1.LogLevel.Warn, 'Das Zigbee Gerät hat unter 20% Batterie.');
                 }
                 break;
@@ -134,16 +123,6 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
                 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;
-    }
     resetFallbackTimeout() {
         if (this._fallBackTimeout) {
             this.log(models_1.LogLevel.Trace, 'Fallback Timeout zurücksetzen');
@@ -160,18 +139,5 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
             this.updateMovement(false);
         }, 270000, this);
     }
-    /**
-     * 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.ZigbeeMotionSensor = ZigbeeMotionSensor;

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

@@ -84,13 +84,13 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
         }
         this.log(models_1.LogLevel.Debug, c.logMessage);
         if (this._window !== undefined) {
-            if (this._window.griffeInPosition(models_2.WindowPosition.offen) > 0 && pPosition < 100) {
+            if (this._window.griffeInPosition(models_2.WindowPosition.open) > 0 && pPosition < 100) {
                 if (!c.skipOpenWarning) {
                     this.log(models_1.LogLevel.Alert, 'Not closing the shutter, as the window is open!');
                 }
                 return;
             }
-            if (this._window.griffeInPosition(models_2.WindowPosition.kipp) > 0 && pPosition < 50) {
+            if (this._window.griffeInPosition(models_2.WindowPosition.tilted) > 0 && pPosition < 50) {
                 pPosition = 50;
                 if (!c.skipOpenWarning) {
                     this.log(models_1.LogLevel.Alert, 'Not closing the shutter, as the window is half open!');

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

@@ -0,0 +1,36 @@
+import { ZigbeeDevice } from './index';
+import { Battery, HandleSensor } from '../../sharedFunctions';
+import { iBatteryDevice, iHandleSensor } from '../../baseDeviceInterfaces';
+import { DeviceType } from '../../deviceType';
+import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
+import { WindowPosition } from '../../models';
+import { Window } from '../../groups';
+import { HandleSettings } from '../../../../models/deviceSettings/handleSettings';
+export declare class ZigbeeWindowHandle extends ZigbeeDevice implements iHandleSensor, iBatteryDevice {
+    /** @inheritDoc */
+    readonly battery: Battery;
+    /** @inheritDoc */
+    readonly handleSensor: HandleSensor;
+    /** @inheritDoc */
+    settings: HandleSettings;
+    constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
+    /** @inheritDoc */
+    get position(): WindowPosition;
+    /** @inheritDoc */
+    get minutesOpen(): number;
+    /** @inheritDoc */
+    get batteryLevel(): number;
+    /** @inheritDoc */
+    get window(): Window | undefined;
+    /** @inheritDoc */
+    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, pOverride?: boolean): void;
+    private toWindowPosition;
+}

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

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZigbeeWindowHandle = void 0;
+const index_1 = require("./index");
+const sharedFunctions_1 = require("../../sharedFunctions");
+const DeviceCapability_1 = require("../../DeviceCapability");
+const models_1 = require("../../models");
+const models_2 = require("../../../../models");
+const handleSettings_1 = require("../../../../models/deviceSettings/handleSettings");
+class ZigbeeWindowHandle extends index_1.ZigbeeDevice {
+    constructor(pInfo, deviceType) {
+        super(pInfo, deviceType);
+        /** @inheritDoc */
+        this.battery = new sharedFunctions_1.Battery(this);
+        /** @inheritDoc */
+        this.handleSensor = new sharedFunctions_1.HandleSensor(this);
+        /** @inheritDoc */
+        this.settings = new handleSettings_1.HandleSettings();
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.handleSensor);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
+    }
+    /** @inheritDoc */
+    get position() {
+        return this.handleSensor.position;
+    }
+    /** @inheritDoc */
+    get minutesOpen() {
+        return this.handleSensor.minutesOpen;
+    }
+    /** @inheritDoc */
+    get batteryLevel() {
+        return this.battery.level;
+    }
+    /** @inheritDoc */
+    get window() {
+        return this.handleSensor.window;
+    }
+    /** @inheritDoc */
+    set window(value) {
+        this.handleSensor.window = value;
+    }
+    /** @inheritDoc */
+    addOffenCallback(pCallback) {
+        this.handleSensor.addOffenCallback(pCallback);
+    }
+    /** @inheritDoc */
+    addKippCallback(pCallback) {
+        this.handleSensor.addKippCallback(pCallback);
+    }
+    /** @inheritDoc */
+    addClosedCallback(pCallback) {
+        this.handleSensor.addClosedCallback(pCallback);
+    }
+    /** @inheritDoc */
+    update(idSplit, state, initial = false, pOverride = false) {
+        super.update(idSplit, state, initial, pOverride);
+        switch (idSplit[3]) {
+            case 'position':
+                this.handleSensor.position = this.toWindowPosition(state.val);
+                break;
+            case 'battery':
+                this.battery.level = state.val;
+                if (this.batteryLevel < 20) {
+                    this.log(models_2.LogLevel.Warn, 'Das Zigbee Gerät hat unter 20% Batterie.');
+                }
+                break;
+        }
+    }
+    toWindowPosition(val) {
+        switch (val) {
+            case 'up':
+                return models_1.WindowPosition.tilted;
+            case 'right':
+            case 'left':
+                return models_1.WindowPosition.open;
+            case 'down':
+                return models_1.WindowPosition.closed;
+        }
+        throw new Error(`Unknown window position ${val}`);
+    }
+}
+exports.ZigbeeWindowHandle = ZigbeeWindowHandle;

package/lib/server/devices/zigbee/index.d.ts

@@ -18,6 +18,7 @@ export * from './zigbeeInnr142C';
 export * from './zigbeeLinkindLedRgbCct';
 export * from './zigbeeOsramDimmer';
 export * from './zigbeeSMaBiTMagnetContact';
+export * from './zigbeeSodaHandle';
 export * from './zigbeeSonoffMotion';
 export * from './zigbeeSonoffTemp';
 export * from './zigbeeTuyaValve';

package/lib/server/devices/zigbee/index.js

@@ -34,6 +34,7 @@ __exportStar(require("./zigbeeInnr142C"), exports);
 __exportStar(require("./zigbeeLinkindLedRgbCct"), exports);
 __exportStar(require("./zigbeeOsramDimmer"), exports);
 __exportStar(require("./zigbeeSMaBiTMagnetContact"), exports);
+__exportStar(require("./zigbeeSodaHandle"), exports);
 __exportStar(require("./zigbeeSonoffMotion"), exports);
 __exportStar(require("./zigbeeSonoffTemp"), exports);
 __exportStar(require("./zigbeeTuyaValve"), exports);

package/lib/server/devices/zigbee/zigbeeAquaraVibra.d.ts

@@ -1,8 +1,10 @@
-import { BatteryLevelChangeAction } from '../../../models';
 import { iBatteryDevice, iVibrationSensor } from '../baseDeviceInterfaces';
 import { ZigbeeDevice } from './BaseDevices';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
+import { Battery } from '../sharedFunctions';
 export declare class ZigbeeAquaraVibra extends ZigbeeDevice implements iVibrationSensor, iBatteryDevice {
+    /** @inheritDoc */
+    readonly battery: Battery;
     /**
      * The sensitivity of the vibration sensor
      */
@@ -35,8 +37,6 @@ export declare class ZigbeeAquaraVibra extends ZigbeeDevice implements iVibratio
      * Whether the vibration sensor is tilted
      */
     tilt: boolean;
-    private _battery;
-    private _lastBatteryPersist;
     private _vibration;
     private _vibrationBlockedByHandleTimeStamp;
     private _vibrationBlockedByMotionTimeStamp;
@@ -44,8 +44,6 @@ export declare class ZigbeeAquaraVibra extends ZigbeeDevice implements iVibratio
     private _alarmMessage;
     private _vibrationBlockedByGriff;
     private _vibrationBlockedByMotion;
-    private _lastBatteryLevel;
-    private _batteryLevelCallbacks;
     constructor(pInfo: IoBrokerDeviceInfo);
     /** @inheritDoc */
     get vibration(): boolean;
@@ -54,9 +52,7 @@ export declare class ZigbeeAquaraVibra extends ZigbeeDevice implements iVibratio
     /** @inheritDoc */
     get vibrationBlockedByHandleTimeStamp(): number;
     /** @inheritDoc */
-    get lastBatteryPersist(): number;
-    /** @inheritDoc */
-    get battery(): number;
+    get batteryLevel(): number;
     /** @inheritDoc */
     get vibrationBlockedByHandle(): boolean;
     /** @inheritDoc */
@@ -66,15 +62,7 @@ export declare class ZigbeeAquaraVibra extends ZigbeeDevice implements iVibratio
     /** @inheritDoc */
     set vibrationBlockedByMotion(pVal: boolean);
     /** @inheritDoc */
-    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
-    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     setSensitivity(pVal: number): void;
-    /** @inheritDoc */
-    persistBatteryDevice(): void;
     private alarmCheck;
-    /**
-     * Checks whether the battery level did change and if so fires the callbacks
-     */
-    private checkForBatteryChange;
 }