hoffmation-base 1.0.48 → 1.0.49

package/lib/server/devices/DeviceCapability.d.ts

@@ -14,5 +14,6 @@ export declare enum DeviceCapability {
     temperatureSensor = 12,
     vibrationSensor = 13,
     speaker = 14,
-    handleSensor = 15
+    handleSensor = 15,
+    batteryDriven = 16
 }

package/lib/server/devices/DeviceCapability.js

@@ -19,4 +19,5 @@ var DeviceCapability;
     DeviceCapability[DeviceCapability["vibrationSensor"] = 13] = "vibrationSensor";
     DeviceCapability[DeviceCapability["speaker"] = 14] = "speaker";
     DeviceCapability[DeviceCapability["handleSensor"] = 15] = "handleSensor";
+    DeviceCapability[DeviceCapability["batteryDriven"] = 16] = "batteryDriven";
 })(DeviceCapability = exports.DeviceCapability || (exports.DeviceCapability = {}));

package/lib/server/devices/IoBrokerBaseDevice.d.ts

@@ -13,7 +13,6 @@ export declare abstract class IoBrokerBaseDevice implements iBaseDevice {
         [id: string]: RoomDeviceAddingSettings;
     };
     room: RoomBase | undefined;
-    battery: number | undefined;
     readonly deviceCapabilities: DeviceCapability[];
     protected constructor(_info: IoBrokerDeviceInfo, deviceType: DeviceType);
     get id(): string;

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

@@ -0,0 +1,4 @@
+import { iBaseDevice } from './iBaseDevice';
+export interface iBatteryDevice extends iBaseDevice {
+    battery: number;
+}

package/lib/server/devices/baseDeviceInterfaces/iBatteryDevice.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,6 +1,7 @@
 export * from './iAcDevice';
 export * from './iActuator';
 export * from './iBaseDevice';
+export * from './iBatteryDevice';
 export * from './iButtonSwitch';
 export * from './iEnergyManager';
 export * from './iExcessEnergyConsumer';

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

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./iAcDevice"), exports);
 __exportStar(require("./iActuator"), exports);
 __exportStar(require("./iBaseDevice"), exports);
+__exportStar(require("./iBatteryDevice"), exports);
 __exportStar(require("./iButtonSwitch"), exports);
 __exportStar(require("./iEnergyManager"), exports);
 __exportStar(require("./iExcessEnergyConsumer"), exports);

package/lib/server/devices/devices.js

@@ -9,6 +9,7 @@ const services_1 = require("../services");
 const IoBrokerDeviceInfo_1 = require("./IoBrokerDeviceInfo");
 const jsObject_1 = require("./jsObject");
 const wledDevice_1 = require("./wledDevice");
+const DeviceCapability_1 = require("./DeviceCapability");
 class Devices {
     constructor(pDeviceData, pRoomImportEnforcer) {
         // This forces import of rooms at correct timing, to allow devices to land in proper rooms.
@@ -65,6 +66,9 @@ class Devices {
         ];
         for (const key in this.alLDevices) {
             const d = this.alLDevices[key];
+            if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.batteryDriven)) {
+                continue;
+            }
             if (d.battery !== undefined) {
                 data.push({ name: d.info.customName, amount: d.battery });
             }

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

@@ -19,13 +19,10 @@ class HmIPDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             return;
         }
         switch (idSplit[4]) {
-            case 'OPERATING_VOLTAGE':
-                this.battery = state.val;
-                break;
             case 'LOW_BAT':
                 const newBatLowVal = state.val;
                 if (newBatLowVal) {
-                    this.log(models_1.LogLevel.Alert, `!!BATTERIE FAST LEER!!`);
+                    this.log(models_1.LogLevel.Warn, `!!BATTERIE FAST LEER!!`);
                 }
                 break;
         }

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

@@ -4,8 +4,9 @@ import { Fenster } from '../groups';
 import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { HmIPDevice } from './hmIpDevice';
-import { iHandleSensor } from '../baseDeviceInterfaces';
-export declare class HmIpGriff extends HmIPDevice implements iHandleSensor {
+import { iBatteryDevice, iHandleSensor } from '../baseDeviceInterfaces';
+export declare class HmIpGriff extends HmIPDevice implements iHandleSensor, iBatteryDevice {
+    battery: number;
     position: FensterPosition;
     private _kippCallback;
     private _closedCallback;

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

@@ -14,6 +14,7 @@ const DeviceCapability_1 = require("../DeviceCapability");
 class HmIpGriff extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpGriff);
+        this.battery = -99;
         this.position = models_1.FensterPosition.geschlossen;
         this._kippCallback = [];
         this._closedCallback = [];
@@ -22,6 +23,7 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
         this._fenster = undefined;
         this._helpingRoomTemp = false;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.handleSensor);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
     }
     set Fenster(value) {
         this._fenster = value;
@@ -39,9 +41,21 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
         this.log(models_2.LogLevel.DeepTrace, `Griff Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
+            case '0':
+                switch (idSplit[4]) {
+                    case 'OPERATING_VOLTAGE':
+                        this.battery = (state.val - 0.9) / 0.6;
+                        break;
+                }
+                break;
             case '1':
-                if (idSplit[4] === 'STATE') {
-                    this.updatePosition(state.val);
+                switch (idSplit[4]) {
+                    case 'STATE':
+                        this.updatePosition(state.val);
+                        break;
+                    case 'OPERATING_VOLTAGE':
+                        this.battery = (state.val - 0.9) / 0.6;
+                        break;
                 }
                 break;
         }

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

@@ -1,10 +1,12 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-export declare class HmIpHeizung extends HmIPDevice {
+import { iBatteryDevice } from '../baseDeviceInterfaces';
+export declare class HmIpHeizung extends HmIPDevice implements iBatteryDevice {
     private _temperatur;
     private _level;
     private _adaptionState;
+    battery: number;
     constructor(pInfo: IoBrokerDeviceInfo);
     private _desiredTemperatur;
     get desiredTemperatur(): number;

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

@@ -4,6 +4,7 @@ exports.HmIpHeizung = void 0;
 const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
 const hmIpDevice_1 = require("./hmIpDevice");
+const DeviceCapability_1 = require("../DeviceCapability");
 var HmIpHeizungAdaptionStates;
 (function (HmIpHeizungAdaptionStates) {
     HmIpHeizungAdaptionStates[HmIpHeizungAdaptionStates["StateNotAvailable"] = 0] = "StateNotAvailable";
@@ -21,7 +22,9 @@ class HmIpHeizung extends hmIpDevice_1.HmIPDevice {
         super(pInfo, deviceType_1.DeviceType.HmIpHeizung);
         this._temperatur = 0;
         this._level = 0;
+        this.battery = -99;
         this._desiredTemperatur = 0;
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
     }
     get desiredTemperatur() {
         return this._desiredTemperatur;
@@ -36,6 +39,13 @@ class HmIpHeizung extends hmIpDevice_1.HmIPDevice {
         this.log(models_1.LogLevel.DeepTrace, `Heizung Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
+            case '0':
+                switch (idSplit[4]) {
+                    case 'OPERATING_VOLTAGE':
+                        this.battery = (state.val - 1.8) / 1.2;
+                        break;
+                }
+                break;
             case '1':
                 this.updateBaseInformation(idSplit[4], state);
                 break;

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

@@ -1,12 +1,13 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
-import { iIlluminationSensor } from '../baseDeviceInterfaces';
+import { iBatteryDevice, iIlluminationSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-export declare class HmIpPraezenz extends HmIPDevice implements iIlluminationSensor {
+export declare class HmIpPraezenz extends HmIPDevice implements iIlluminationSensor, iBatteryDevice {
     private static PRESENCE_DETECTION;
     private static CURRENT_ILLUMINATION;
     excludeFromNightAlarm: boolean;
     presenceDetected: boolean;
+    battery: number;
     private _presenceDetectedCallback;
     private initialized;
     constructor(pInfo: IoBrokerDeviceInfo);

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

@@ -12,12 +12,14 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
         super(pInfo, deviceType_1.DeviceType.HmIpPraezenz);
         this.excludeFromNightAlarm = false;
         this.presenceDetected = false;
+        this.battery = -99;
         this._presenceDetectedCallback = [];
         // private presenceStateID: string;
         this.initialized = false;
         this._detectionsToday = 0;
         this._currentIllumination = -1;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.illuminationSensor);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         // this.presenceStateID = `${this.info.fullID}.1.${HmIpPraezenz.PRESENCE_DETECTION}`;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.getCount(this).then((todayCount) => {
             this.detectionsToday = todayCount.counter;
@@ -51,16 +53,23 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
     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);
-        if (idSplit[3] !== '1') {
-            // Nur die Infos in Kanal 1 sind relevant
-            return;
-        }
-        switch (idSplit[4]) {
-            case HmIpPraezenz.PRESENCE_DETECTION:
-                this.updatePresence(state.val);
+        switch (idSplit[3]) {
+            case '0':
+                switch (idSplit[4]) {
+                    case 'OPERATING_VOLTAGE':
+                        this.battery = (state.val - 1.8) / 1.2;
+                        break;
+                }
                 break;
-            case HmIpPraezenz.CURRENT_ILLUMINATION:
-                this.currentIllumination = state.val;
+            case '1':
+                switch (idSplit[4]) {
+                    case HmIpPraezenz.PRESENCE_DETECTION:
+                        this.updatePresence(state.val);
+                        break;
+                    case HmIpPraezenz.CURRENT_ILLUMINATION:
+                        this.currentIllumination = state.val;
+                        break;
+                }
                 break;
         }
     }

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

@@ -1,9 +1,9 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
-import { iButtonSwitch } from '../baseDeviceInterfaces';
+import { iBatteryDevice, iButtonSwitch } from '../baseDeviceInterfaces';
 import { Button } from '../button';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-export declare class HmIpTaster extends HmIPDevice implements iButtonSwitch {
+export declare class HmIpTaster extends HmIPDevice implements iButtonSwitch, iBatteryDevice {
     private static readonly BUTTON_CAPABILLITIES;
     buttonTopLeft: Button;
     buttonMidLeft: Button;
@@ -13,6 +13,7 @@ export declare class HmIpTaster extends HmIPDevice implements iButtonSwitch {
     buttonBotRight: Button;
     buttonBot: undefined;
     buttonTop: undefined;
+    battery: number;
     constructor(pInfo: IoBrokerDeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     getButtonAssignment(): string;

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

@@ -17,13 +17,22 @@ class HmIpTaster extends hmIpDevice_1.HmIPDevice {
         this.buttonBotRight = new button_1.Button('BotRight', HmIpTaster.BUTTON_CAPABILLITIES);
         this.buttonBot = undefined;
         this.buttonTop = undefined;
+        this.battery = -99;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.buttonSwitch);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
     }
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Taster Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
         super.update(idSplit, state, initial, true);
         let cTaste = undefined;
         switch (idSplit[3]) {
+            case '0':
+                switch (idSplit[4]) {
+                    case 'OPERATING_VOLTAGE':
+                        this.battery = (state.val - 1.8) / 1.2;
+                        break;
+                }
+                break;
             case '1':
                 cTaste = this.buttonTopLeft;
                 break;

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

@@ -1,7 +1,9 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-export declare class HmIpTherm extends HmIPDevice {
+import { iBatteryDevice } from '../baseDeviceInterfaces';
+export declare class HmIpTherm extends HmIPDevice implements iBatteryDevice {
+    battery: number;
     constructor(pInfo: IoBrokerDeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
 }

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

@@ -4,13 +4,25 @@ exports.HmIpTherm = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
+const DeviceCapability_1 = require("../DeviceCapability");
 class HmIpTherm extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpTherm);
+        this.battery = -99;
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
     }
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Thermostat Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
+        switch (idSplit[3]) {
+            case '0':
+                switch (idSplit[4]) {
+                    case 'OPERATING_VOLTAGE':
+                        this.battery = (state.val - 1.8) / 1.2;
+                        break;
+                }
+                break;
+        }
     }
 }
 exports.HmIpTherm = HmIpTherm;

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

@@ -22,12 +22,6 @@ class ZigbeeDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
                     this.log(models_1.LogLevel.Debug, `Das Zigbee Gerät ist nicht erreichbar.`);
                 }
                 break;
-            case 'battery':
-                this.battery = state.val;
-                if (this.battery < 20) {
-                    this.log(models_1.LogLevel.Alert, `Das Zigbee Gerät hat unter 20% Batterie.`);
-                }
-                break;
             case 'link_quality':
                 this.linkQuality = state.val;
                 if (this.linkQuality < 5) {

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

@@ -3,7 +3,9 @@ import { DeviceType } from '../../deviceType';
 import { ZigbeeDevice } from './zigbeeDevice';
 import { MagnetPosition } from '../../models';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
-export declare class ZigbeeMagnetContact extends ZigbeeDevice {
+import { iBatteryDevice } from '../../baseDeviceInterfaces';
+export declare class ZigbeeMagnetContact extends ZigbeeDevice implements iBatteryDevice {
+    battery: number;
     position: MagnetPosition;
     telegramOnOpen: boolean;
     speakOnOpen: boolean;

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

@@ -8,6 +8,7 @@ const models_2 = require("../../models");
 class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, deviceType) {
         super(pInfo, deviceType);
+        this.battery = -99;
         this.position = models_2.MagnetPosition.closed;
         this.telegramOnOpen = false;
         this.speakOnOpen = false;
@@ -23,6 +24,14 @@ class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
     }
     update(idSplit, state, initial = false, pOverrride = false) {
         super.update(idSplit, state, initial, pOverrride);
+        switch (idSplit[3]) {
+            case 'battery':
+                this.battery = state.val;
+                if (this.battery < 20) {
+                    this.log(models_1.LogLevel.Warn, `Das Zigbee Gerät hat unter 20% Batterie.`);
+                }
+                break;
+        }
     }
     updatePosition(pValue) {
         if (pValue === this.position) {

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

@@ -3,11 +3,12 @@
 import { DeviceType } from '../../deviceType';
 import { ZigbeeDevice } from './index';
 import { MotionSensorSettings } from '../../../../models';
-import { iMotionSensor } from '../../baseDeviceInterfaces';
+import { iBatteryDevice, iMotionSensor } from '../../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
-export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionSensor {
+export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionSensor, iBatteryDevice {
     settings: MotionSensorSettings;
     movementDetected: boolean;
+    battery: number;
     protected _initialized: boolean;
     protected _movementDetectedCallback: Array<(pValue: boolean) => void>;
     protected _needsMovementResetFallback: boolean;

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

@@ -11,12 +11,14 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
         super(pInfo, type);
         this.settings = new models_1.MotionSensorSettings();
         this.movementDetected = false;
+        this.battery = -99;
         this._initialized = false;
         this._movementDetectedCallback = [];
         this._needsMovementResetFallback = true;
         this._timeSinceLastMotion = 0;
         this._detectionsToday = 0;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.motionSensor);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.getCount(this).then((todayCount) => {
             this.detectionsToday = todayCount.counter;
             this.log(models_1.LogLevel.Debug, `Preinitialized movement counter with ${this.detectionsToday}`);
@@ -79,6 +81,12 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
         this.log(models_1.LogLevel.DeepTrace, `Motion update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, pOverride);
         switch (idSplit[3]) {
+            case 'battery':
+                this.battery = state.val;
+                if (this.battery < 20) {
+                    this.log(models_1.LogLevel.Warn, `Das Zigbee Gerät hat unter 20% Batterie.`);
+                }
+                break;
             case 'occupancy':
                 this.log(models_1.LogLevel.Trace, `Motion sensor: Update for motion state of ${this.info.customName}: ${state.val}`);
                 this.updateMovement(state.val);

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

@@ -5,6 +5,7 @@ import { DeviceType } from '../../deviceType';
 import { Button } from '../../button';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 export declare abstract class ZigbeeSwitch extends ZigbeeDevice implements iButtonSwitch {
+    battery: number;
     abstract buttonBot: Button | undefined;
     abstract buttonBotLeft: Button | undefined;
     abstract buttonBotRight: Button | undefined;

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

@@ -2,12 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeSwitch = void 0;
 const zigbeeDevice_1 = require("./zigbeeDevice");
+const DeviceCapability_1 = require("../../DeviceCapability");
+const models_1 = require("../../../../models");
 class ZigbeeSwitch extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, deviceType) {
         super(pInfo, deviceType);
+        this.battery = -99;
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
     }
     update(idSplit, state, initial = false, pOverrride = false) {
         super.update(idSplit, state, initial, pOverrride);
+        switch (idSplit[3]) {
+            case 'battery':
+                this.battery = state.val;
+                if (this.battery < 20) {
+                    this.log(models_1.LogLevel.Warn, `Das Zigbee Gerät hat unter 20% Batterie.`);
+                }
+                break;
+        }
     }
 }
 exports.ZigbeeSwitch = ZigbeeSwitch;

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

@@ -1,8 +1,9 @@
 /// <reference types="iobroker" />
-import { iVibrationSensor } from '../baseDeviceInterfaces';
+import { iBatteryDevice, iVibrationSensor } from '../baseDeviceInterfaces';
 import { ZigbeeDevice } from './BaseDevices';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-export declare class ZigbeeAquaraVibra extends ZigbeeDevice implements iVibrationSensor {
+export declare class ZigbeeAquaraVibra extends ZigbeeDevice implements iVibrationSensor, iBatteryDevice {
+    battery: number;
     sensitivity: string;
     tiltAngle: number;
     tiltAngleX: number;

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

@@ -9,6 +9,7 @@ const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraVibra);
+        this.battery = -99;
         this.sensitivity = '';
         this.tiltAngle = 0;
         this.tiltAngleX = 0;
@@ -24,6 +25,7 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
         // TODO Set Sensitivity
         this._vibrationBlockedByGriff = false;
         this._vibrationBlockedByMotion = false;
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.vibrationSensor);
         this._alarmMessage = services_1.Res.vibrationAlarm(this.info.customName);
         services_1.PollyService.preloadTTS(this._alarmMessage);
@@ -53,6 +55,12 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
         this.log(models_1.LogLevel.DeepTrace, `Stecker Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
+            case 'battery':
+                this.battery = state.val;
+                if (this.battery < 20) {
+                    this.log(models_1.LogLevel.Warn, `Das Zigbee Gerät hat unter 20% Batterie.`);
+                }
+                break;
             case 'sensitivity':
                 this.log(initial ? models_1.LogLevel.DeepTrace : models_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf Sensitivity: ${state.val}`);
                 this.tiltAngleZ = state.val;

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

@@ -2,7 +2,9 @@
 /// <reference types="iobroker" />
 import { ZigbeeDevice } from './BaseDevices';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-export declare class ZigbeeAquaraWater extends ZigbeeDevice {
+import { iBatteryDevice } from '../baseDeviceInterfaces';
+export declare class ZigbeeAquaraWater extends ZigbeeDevice implements iBatteryDevice {
+    battery: number;
     water: boolean;
     iAlarmTimeout: NodeJS.Timeout | undefined;
     private _messageAlarmFirst;

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

@@ -5,9 +5,11 @@ const deviceType_1 = require("../deviceType");
 const services_1 = require("../../services");
 const BaseDevices_1 = require("./BaseDevices");
 const models_1 = require("../../../models");
+const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeAquaraWater extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraWater);
+        this.battery = -99;
         this.water = false;
         this.iAlarmTimeout = undefined;
         this._messageAlarmFirst = '';
@@ -15,6 +17,7 @@ class ZigbeeAquaraWater extends BaseDevices_1.ZigbeeDevice {
         this._messageAlarmEnd = '';
         this._supressAlarmTimeStamp = 0;
         this._roomName = '';
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this._messageAlarmFirst = services_1.Res.waterAlarmStart(this.info.customName, this._roomName);
         this._messageAlarm = services_1.Res.waterAlarmRepeat(this.info.customName, this._roomName);
         this._messageAlarmEnd = services_1.Res.waterAlarmEnd(this._roomName);
@@ -32,6 +35,12 @@ class ZigbeeAquaraWater extends BaseDevices_1.ZigbeeDevice {
         this.log(models_1.LogLevel.DeepTrace, `Water Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
+            case 'battery':
+                this.battery = state.val;
+                if (this.battery < 20) {
+                    this.log(models_1.LogLevel.Warn, `Das Zigbee Gerät hat unter 20% Batterie.`);
+                }
+                break;
             case 'detected':
                 this.log(models_1.LogLevel.Debug, `Wasser Update für ${this.info.customName} auf Wasser: ${state.val}`);
                 const newVal = state.val === true;

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

@@ -2,7 +2,9 @@
 /// <reference types="iobroker" />
 import { ZigbeeDevice } from './BaseDevices';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-export declare class ZigbeeHeimanSmoke extends ZigbeeDevice {
+import { iBatteryDevice } from '../baseDeviceInterfaces';
+export declare class ZigbeeHeimanSmoke extends ZigbeeDevice implements iBatteryDevice {
+    battery: number;
     smoke: boolean;
     iAlarmTimeout: NodeJS.Timeout | undefined;
     private _messageAlarmFirst;

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

@@ -5,15 +5,18 @@ const deviceType_1 = require("../deviceType");
 const services_1 = require("../../services");
 const BaseDevices_1 = require("./BaseDevices");
 const models_1 = require("../../../models");
+const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeHeimanSmoke extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeHeimanSmoke);
+        this.battery = -99;
         this.smoke = false;
         this.iAlarmTimeout = undefined;
         this._messageAlarmFirst = '';
         this._messageAlarm = '';
         this._messageAlarmEnd = '';
         this._roomName = '';
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this._messageAlarmFirst = services_1.Res.fireAlarmStart(this._roomName, this.info.customName);
         this._messageAlarm = services_1.Res.fireAlarmRepeat(this._roomName, this.info.customName);
         this._messageAlarmEnd = services_1.Res.fireAlarmEnd(this._roomName);
@@ -31,6 +34,12 @@ class ZigbeeHeimanSmoke extends BaseDevices_1.ZigbeeDevice {
         this.log(models_1.LogLevel.DeepTrace, `Smoke Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
+            case 'battery':
+                this.battery = state.val;
+                if (this.battery < 20) {
+                    this.log(models_1.LogLevel.Warn, `Das Zigbee Gerät hat unter 20% Batterie.`);
+                }
+                break;
             case 'smoke':
                 this.log(models_1.LogLevel.Debug, `Smoke Update für ${this.info.customName} auf Rauch: ${state.val}`);
                 const newVal = state.val === true;

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

@@ -1,8 +1,9 @@
 /// <reference types="iobroker" />
 import { ZigbeeDevice } from './BaseDevices';
-import { iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
+import { iBatteryDevice, iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-export declare class ZigbeeSonoffTemp extends ZigbeeDevice implements iTemperatureSensor, iHumiditySensor {
+export declare class ZigbeeSonoffTemp extends ZigbeeDevice implements iTemperatureSensor, iHumiditySensor, iBatteryDevice {
+    battery: number;
     private _humidityCallbacks;
     private _temperaturCallbacks;
     constructor(pInfo: IoBrokerDeviceInfo);