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

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

@@ -1,18 +1,21 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpGriff = void 0;
 const deviceType_1 = require("../deviceType");
-const services_1 = require("../../services");
-const models_1 = require("../models");
-const models_2 = require("../../../models");
-const lodash_1 = __importDefault(require("lodash"));
+const models_1 = require("../../../models");
 const hmIpDevice_1 = require("./hmIpDevice");
 const DeviceCapability_1 = require("../DeviceCapability");
 const handleSettings_1 = require("../../../models/deviceSettings/handleSettings");
+const sharedFunctions_1 = require("../sharedFunctions");
 class HmIpGriff extends hmIpDevice_1.HmIPDevice {
+    /** @inheritDoc */
+    get position() {
+        return this.handleSensor.position;
+    }
+    /** @inheritDoc */
+    get minutesOpen() {
+        return this.handleSensor.minutesOpen;
+    }
     /**
      * Creates an instance of {@link DeviceType.HmIpGriff}.
      * @param pInfo - Device creation information
@@ -20,211 +23,64 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpGriff);
         /** @inheritDoc */
-        this.settings = new handleSettings_1.HandleSettings();
+        this.battery = new sharedFunctions_1.Battery(this);
         /** @inheritDoc */
-        this.position = models_1.WindowPosition.geschlossen;
+        this.handleSensor = new sharedFunctions_1.HandleSensor(this);
         /** @inheritDoc */
-        this.minutesOpen = 0;
-        this._battery = -99;
-        this._lastBatteryPersist = 0;
-        this._lastHandlePersist = 0;
-        this._kippCallback = [];
-        this._closedCallback = [];
-        this._offenCallback = [];
-        this._window = undefined;
-        this._helpingRoomTemp = false;
-        this._lastBatteryLevel = -1;
-        this._batteryLevelCallbacks = [];
+        this.settings = new handleSettings_1.HandleSettings();
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.handleSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
     }
     /** @inheritDoc */
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    /** @inheritDoc */
-    get battery() {
-        return this._battery;
+    get batteryLevel() {
+        return this.battery.level;
     }
-    /**
-     * Adds a window to this device
-     */
-    set window(value) {
-        this._window = value;
+    get window() {
+        return this.handleSensor.window;
     }
     /** @inheritDoc */
-    addBatteryLevelCallback(pCallback) {
-        this._batteryLevelCallbacks.push(pCallback);
+    set window(value) {
+        this.handleSensor.window = value;
     }
     /** @inheritDoc */
     addOffenCallback(pCallback) {
-        this._offenCallback.push(pCallback);
+        this.handleSensor.addOffenCallback(pCallback);
     }
     /** @inheritDoc */
     addKippCallback(pCallback) {
-        this._kippCallback.push(pCallback);
+        this.handleSensor.addKippCallback(pCallback);
     }
     /** @inheritDoc */
     addClosedCallback(pCallback) {
-        this._closedCallback.push(pCallback);
+        this.handleSensor.addClosedCallback(pCallback);
     }
     /** @inheritDoc */
     update(idSplit, state, initial = false) {
-        this.log(models_2.LogLevel.DeepTrace, `Griff Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
+        this.log(models_1.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 = 100 * ((state.val - 0.9) / 0.6);
-                        this.checkForBatteryChange();
-                        this.persistBatteryDevice();
+                        this.battery.level = 100 * ((state.val - 0.9) / 0.6);
                         break;
                 }
                 break;
             case '1':
                 switch (idSplit[4]) {
                     case 'STATE':
-                        this.updatePosition(state.val);
+                        this.handleSensor.updatePosition(state.val);
                         break;
                     case 'OPERATING_VOLTAGE':
-                        this._battery = 100 * ((state.val - 0.9) / 0.6);
-                        this.checkForBatteryChange();
-                        this.persistBatteryDevice();
+                        this.battery.level = 100 * ((state.val - 0.9) / 0.6);
                         break;
                 }
                 break;
         }
     }
     /** @inheritDoc */
-    persistBatteryDevice() {
-        var _a;
-        const now = services_1.Utils.nowMS();
-        if (this._lastBatteryPersist + 60000 > now) {
-            return;
-        }
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
-        this._lastBatteryPersist = now;
-    }
-    /**
-     * Persists the handle sensor state to the persistence layer
-     */
-    persistHandleSensor() {
-        var _a;
-        const now = services_1.Utils.nowMS();
-        if (this._lastHandlePersist + 2000 > now) {
-            return;
-        }
-        this.log(models_2.LogLevel.Debug, `Persist handle state: ${this.position}`);
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistHandleSensor(this);
-        this._lastHandlePersist = now;
-    }
-    /** @inheritDoc */
     dispose() {
-        if (this._iOpenTimeout) {
-            clearInterval(this._iOpenTimeout);
-            this._iOpenTimeout = undefined;
-        }
-    }
-    /** @inheritDoc */
-    toJSON() {
-        return lodash_1.default.omit(super.toJSON(), ['_window']);
-    }
-    updatePosition(pValue) {
-        if (pValue === this.position) {
-            if (this._lastHandlePersist == 0) {
-                this.persistHandleSensor();
-            }
-            return;
-        }
-        this.log(models_2.LogLevel.Debug, `Update Windowhandle to position "${models_1.WindowPosition[pValue]}"`);
-        this.position = pValue;
-        for (const c1 of this._closedCallback) {
-            c1(pValue === 0);
-        }
-        for (const c2 of this._kippCallback) {
-            c2(pValue === 1);
-        }
-        for (const c3 of this._offenCallback) {
-            c3(pValue === 2);
-        }
-        this.persistHandleSensor();
-        if (pValue === models_1.WindowPosition.geschlossen) {
-            if (this._iOpenTimeout !== undefined) {
-                clearInterval(this._iOpenTimeout);
-                this.log(models_2.LogLevel.Info, `Window closed after ${this.minutesOpen} minutes`);
-                this.minutesOpen = 0;
-                this._iOpenTimeout = undefined;
-            }
-            return;
-        }
-        if (this._iOpenTimeout !== undefined) {
-            return;
-        }
-        this._iOpenTimeout = services_1.Utils.guardedInterval(() => {
-            var _a;
-            this.minutesOpen++;
-            const heatgroup = (_a = this._window) === null || _a === void 0 ? void 0 : _a.getRoom().HeatGroup;
-            if (heatgroup !== undefined) {
-                const desiredTemp = heatgroup.desiredTemp;
-                const currentTemp = heatgroup.temperature;
-                const outSideTemp = services_1.WeatherService.getCurrentTemp();
-                // Check if any of these values are unavailable
-                if (desiredTemp > -99 && currentTemp > -99 && outSideTemp > -99) {
-                    const wouldHelp = (desiredTemp < currentTemp && outSideTemp < currentTemp) ||
-                        (desiredTemp > currentTemp && outSideTemp > currentTemp);
-                    if (!wouldHelp && this._helpingRoomTemp) {
-                        const info = "Window should be closed, as it doesn't help reaching target temperature.";
-                        this.log(models_2.LogLevel.Info, info);
-                        if (this.settings.informNotHelping) {
-                            services_1.TelegramService.inform(info);
-                        }
-                        this._helpingRoomTemp = false;
-                    }
-                    else if (wouldHelp && !this._helpingRoomTemp) {
-                        this._helpingRoomTemp = true;
-                        const info = `Das Fenster hilft der Innentemperatur ihr Ziel von ${desiredTemp} zu erreichen. Draußen sind es ${outSideTemp}. Du wirst informiert wenn es nicht mehr hilft.`;
-                        this.log(models_2.LogLevel.Info, info);
-                        if (this.settings.informIsHelping) {
-                            services_1.TelegramService.inform(info);
-                        }
-                        return;
-                    }
-                    else if (wouldHelp && this._helpingRoomTemp) {
-                        return;
-                    }
-                }
-            }
-            const message = `Window is in position ${models_1.WindowPosition[this.position]} since ${this.minutesOpen} minutes`;
-            switch (this.minutesOpen) {
-                case 15:
-                case 30:
-                case 60:
-                case 120:
-                case 240:
-                    this.log(models_2.LogLevel.Info, message);
-                    if (this.settings.informOnOpen) {
-                        services_1.TelegramService.inform(`${this.info.room}: ${message}`);
-                    }
-                    break;
-                default:
-                    this.log(models_2.LogLevel.Trace, message);
-                    break;
-            }
-        }, 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_2.BatteryLevelChangeAction(this));
-        }
-        this._lastBatteryLevel = newLevel;
+        this.handleSensor.dispose();
     }
 }
 exports.HmIpGriff = HmIpGriff;

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

@@ -3,34 +3,29 @@ import { iDisposable } from '../../services';
 import { HeaterSettings, HumiditySensorChangeAction, TemperatureSensorChangeAction } from '../../../models';
 import { iHeater, iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
+import { HumiditySensor, TemperatureSensor } from '../sharedFunctions';
 export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSensor, iHumiditySensor, iHeater, iDisposable {
     /** @inheritDoc */
     readonly persistHeaterInterval: NodeJS.Timeout;
     /** @inheritDoc */
-    readonly persistTemperatureSensorInterval: NodeJS.Timeout;
+    temperatureSensor: TemperatureSensor;
     /** @inheritDoc */
-    readonly persistHumiditySensorInterval: NodeJS.Timeout;
+    humiditySensor: HumiditySensor;
     /** @inheritDoc */
     settings: HeaterSettings;
     private _iAutomaticInterval;
     private _initialSeasonCheckDone;
     private _level;
     private _setPointTemperatureID;
-    private _humidityCallbacks;
-    private _temperatureCallbacks;
     constructor(pInfo: IoBrokerDeviceInfo);
     protected _seasonTurnOff: boolean;
     /** @inheritDoc */
     get seasonTurnOff(): boolean;
     /** @inheritDoc */
     set seasonTurnOff(value: boolean);
-    private _temperature;
     get temperature(): number;
-    private set temperature(value);
-    private _humidity;
     /** @inheritDoc */
     get humidity(): number;
-    private set humidity(value);
     private _desiredTemperature;
     /** @inheritDoc */
     get desiredTemperature(): number;
@@ -43,7 +38,6 @@ export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSe
     get sTemperature(): string;
     /** @inheritDoc */
     get iTemperature(): number;
-    private _roomTemperature;
     /** @inheritDoc */
     get roomTemperature(): number;
     /** @inheritDoc */
@@ -62,9 +56,7 @@ export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSe
     /** @inheritDoc */
     persistHeater(): void;
     /** @inheritDoc */
-    persistHumiditySensor(): void;
-    private updateBaseInformation;
-    private checkSeasonTurnOff;
-    /** @inheritDoc */
     dispose(): void;
+    private checkSeasonTurnOff;
+    private updateBaseInformation;
 }

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

@@ -5,9 +5,9 @@ const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
 const services_1 = require("../../services");
 const models_1 = require("../../../models");
-const baseDeviceInterfaces_1 = require("../baseDeviceInterfaces");
 const device_cluster_type_1 = require("../device-cluster-type");
 const DeviceCapability_1 = require("../DeviceCapability");
+const sharedFunctions_1 = require("../sharedFunctions");
 class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpHeizgruppe);
@@ -16,25 +16,16 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
             this.persistHeater();
         }, 5 * 60 * 1000, this, false);
         /** @inheritDoc */
-        this.persistTemperatureSensorInterval = services_1.Utils.guardedInterval(() => {
-            this.persistTemperaturSensor();
-        }, 5 * 60 * 1000, this, false);
+        this.temperatureSensor = new sharedFunctions_1.TemperatureSensor(this);
         /** @inheritDoc */
-        this.persistHumiditySensorInterval = services_1.Utils.guardedInterval(() => {
-            this.persistHumiditySensor();
-        }, 5 * 60 * 1000, this, false);
+        this.humiditySensor = new sharedFunctions_1.HumiditySensor(this);
         /** @inheritDoc */
         this.settings = new models_1.HeaterSettings();
         this._initialSeasonCheckDone = false;
         this._level = 0;
         this._setPointTemperatureID = '';
-        this._humidityCallbacks = [];
-        this._temperatureCallbacks = [];
         this._seasonTurnOff = false;
-        this._temperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
-        this._humidity = baseDeviceInterfaces_1.UNDEFINED_HUMIDITY_VALUE;
         this._desiredTemperature = 0;
-        this._roomTemperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.temperatureSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.humiditySensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.heater);
@@ -60,25 +51,13 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     }
     get temperature() {
         if (this.settings.useOwnTemperatur) {
-            return this._temperature;
-        }
-        return this._roomTemperature;
-    }
-    set temperature(val) {
-        this._temperature = val;
-        for (const cb of this._temperatureCallbacks) {
-            cb(new models_1.TemperatureSensorChangeAction(this, val));
+            return this.temperatureSensor.temperature;
         }
+        return this.roomTemperature;
     }
     /** @inheritDoc */
     get humidity() {
-        return this._humidity;
-    }
-    set humidity(val) {
-        this._humidity = val;
-        for (const cb of this._humidityCallbacks) {
-            cb(new models_1.HumiditySensorChangeAction(this, val));
-        }
+        return this.humiditySensor.humidity;
     }
     /** @inheritDoc */
     get desiredTemperature() {
@@ -109,14 +88,11 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     }
     /** @inheritDoc */
     get roomTemperature() {
-        return this._roomTemperature;
+        return this.temperatureSensor.roomTemperature;
     }
     /** @inheritDoc */
     addHumidityCallback(pCallback) {
-        this._humidityCallbacks.push(pCallback);
-        if (this._humidity > 0) {
-            pCallback(new models_1.HumiditySensorChangeAction(this, this._humidity));
-        }
+        this.humiditySensor.addHumidityCallback(pCallback);
     }
     getBelongingHeizungen() {
         return this.room.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Heater);
@@ -153,14 +129,11 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     }
     /** @inheritDoc */
     addTempChangeCallback(pCallback) {
-        this._temperatureCallbacks.push(pCallback);
-        if (this._temperature > baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
-            pCallback(new models_1.TemperatureSensorChangeAction(this, this._temperature));
-        }
+        this.temperatureSensor.addTempChangeCallback(pCallback);
     }
     /** @inheritDoc */
     onTemperaturChange(newTemperatur) {
-        this._roomTemperature = newTemperatur;
+        this.temperatureSensor.roomTemperature = newTemperatur;
     }
     /** @inheritDoc */
     persistTemperaturSensor() {
@@ -173,20 +146,35 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistHeater(this);
     }
     /** @inheritDoc */
-    persistHumiditySensor() {
-        var _a;
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistHumiditySensor(this);
+    dispose() {
+        this.temperatureSensor.dispose();
+        this.humiditySensor.dispose();
+        if (this.persistHeaterInterval) {
+            clearInterval(this.persistHeaterInterval);
+        }
+        if (this._iAutomaticInterval) {
+            clearInterval(this._iAutomaticInterval);
+            this._iAutomaticInterval = undefined;
+        }
+    }
+    checkSeasonTurnOff() {
+        const isSummer = services_1.Utils.beetweenDays(new Date(), this.settings.seasonTurnOffDay, this.settings.seasonTurnOnDay);
+        if (isSummer !== this.seasonTurnOff || !this._initialSeasonCheckDone) {
+            this.log(models_1.LogLevel.Info, `Switching Seasonal Heating --> New seasonTurnOff: ${isSummer}`);
+            this.seasonTurnOff = isSummer;
+        }
+        this._initialSeasonCheckDone = true;
     }
     updateBaseInformation(name, state) {
         switch (name) {
             case 'ACTUAL_TEMPERATURE':
-                this.temperature = state.val;
+                this.temperatureSensor.temperature = state.val;
                 break;
             case 'LEVEL':
                 this._level = state.val;
                 break;
             case 'HUMIDITY':
-                this.humidity = state.val;
+                this.humiditySensor.humidity = state.val;
                 break;
             case 'SET_POINT_TEMPERATURE':
                 this.log(models_1.LogLevel.DeepTrace, `Heizgruppe Update Soll-Temperatur JSON: ${JSON.stringify(state)}`);
@@ -194,29 +182,5 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
                 break;
         }
     }
-    checkSeasonTurnOff() {
-        const isSummer = services_1.Utils.beetweenDays(new Date(), this.settings.seasonTurnOffDay, this.settings.seasonTurnOnDay);
-        if (isSummer !== this.seasonTurnOff || !this._initialSeasonCheckDone) {
-            this.log(models_1.LogLevel.Info, `Switching Seasonal Heating --> New seasonTurnOff: ${isSummer}`);
-            this.seasonTurnOff = isSummer;
-        }
-        this._initialSeasonCheckDone = true;
-    }
-    /** @inheritDoc */
-    dispose() {
-        if (this.persistTemperatureSensorInterval) {
-            clearInterval(this.persistTemperatureSensorInterval);
-        }
-        if (this.persistHumiditySensorInterval) {
-            clearInterval(this.persistHumiditySensorInterval);
-        }
-        if (this.persistHeaterInterval) {
-            clearInterval(this.persistHeaterInterval);
-        }
-        if (this._iAutomaticInterval) {
-            clearInterval(this._iAutomaticInterval);
-            this._iAutomaticInterval = undefined;
-        }
-    }
 }
 exports.HmIpHeizgruppe = HmIpHeizgruppe;

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

@@ -1,30 +1,20 @@
-import { BatteryLevelChangeAction } from '../../../models';
 import { HmIPDevice } from './hmIpDevice';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { iBatteryDevice } from '../baseDeviceInterfaces';
+import { Battery } from '../sharedFunctions';
 export declare class HmIpHeizung extends HmIPDevice implements iBatteryDevice {
-    private _battery;
+    /** @inheritDoc */
+    readonly battery: Battery;
     private _temperatur;
     private _level;
     private _adaptionState;
-    private _lastBatteryPersist;
-    private _lastBatteryLevel;
-    private _batteryLevelCallbacks;
     private _desiredTemperatur;
     constructor(pInfo: IoBrokerDeviceInfo);
-    get lastBatteryPersist(): number;
-    get battery(): number;
+    get batteryLevel(): number;
     get desiredTemperatur(): number;
     get iLevel(): number;
     get iTemperatur(): number;
     /** @inheritDoc */
-    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
-    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
-    persistBatteryDevice(): void;
     private updateBaseInformation;
-    /**
-     * Checks whether the battery level did change and if so fires the callbacks
-     */
-    private checkForBatteryChange;
 }

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

@@ -5,7 +5,7 @@ const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
 const hmIpDevice_1 = require("./hmIpDevice");
 const DeviceCapability_1 = require("../DeviceCapability");
-const services_1 = require("../../services");
+const sharedFunctions_1 = require("../sharedFunctions");
 var HmIpHeizungAdaptionStates;
 (function (HmIpHeizungAdaptionStates) {
     HmIpHeizungAdaptionStates[HmIpHeizungAdaptionStates["StateNotAvailable"] = 0] = "StateNotAvailable";
@@ -21,20 +21,15 @@ var HmIpHeizungAdaptionStates;
 class HmIpHeizung extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpHeizung);
-        this._battery = -99;
+        /** @inheritDoc */
+        this.battery = new sharedFunctions_1.Battery(this);
         this._temperatur = 0;
         this._level = 0;
-        this._lastBatteryPersist = 0;
-        this._lastBatteryLevel = -1;
-        this._batteryLevelCallbacks = [];
         this._desiredTemperatur = 0;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
     }
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    get battery() {
-        return this._battery;
+    get batteryLevel() {
+        return this.battery.level;
     }
     get desiredTemperatur() {
         return this._desiredTemperatur;
@@ -46,10 +41,6 @@ class HmIpHeizung extends hmIpDevice_1.HmIPDevice {
         return this._temperatur;
     }
     /** @inheritDoc */
-    addBatteryLevelCallback(pCallback) {
-        this._batteryLevelCallbacks.push(pCallback);
-    }
-    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Heizung Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
@@ -57,9 +48,7 @@ class HmIpHeizung extends hmIpDevice_1.HmIPDevice {
             case '0':
                 switch (idSplit[4]) {
                     case 'OPERATING_VOLTAGE':
-                        this._battery = 100 * ((state.val - 1.8) / 1.2);
-                        this.checkForBatteryChange();
-                        this.persistBatteryDevice();
+                        this.battery.level = 100 * ((state.val - 1.8) / 1.2);
                         break;
                 }
                 break;
@@ -68,15 +57,6 @@ class HmIpHeizung extends hmIpDevice_1.HmIPDevice {
                 break;
         }
     }
-    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;
-    }
     updateBaseInformation(name, state) {
         switch (name) {
             case 'ACTUAL_TEMPERATURE':
@@ -98,18 +78,5 @@ class HmIpHeizung extends hmIpDevice_1.HmIPDevice {
                 break;
         }
     }
-    /**
-     * 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.HmIpHeizung = HmIpHeizung;

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

@@ -1,41 +1,32 @@
 import { HmIPDevice } from './hmIpDevice';
-import { BatteryLevelChangeAction, MotionSensorAction, MotionSensorSettings } from '../../../models';
+import { MotionSensorAction, MotionSensorSettings } from '../../../models';
 import { iBatteryDevice, iIlluminationSensor, iMotionSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
+import { Battery } from '../sharedFunctions';
 export declare class HmIpPraezenz extends HmIPDevice implements iIlluminationSensor, iBatteryDevice, iMotionSensor {
+    /** @inheritDoc */
+    readonly battery: Battery;
     private static PRESENCE_DETECTION;
     private static CURRENT_ILLUMINATION;
     /** @inheritDoc */
     movementDetected: boolean;
     /** @inheritDoc */
     settings: MotionSensorSettings;
-    private _battery;
-    private _lastBatteryPersist;
     private _movementDetectedCallback;
     private initialized;
     private _lastMotionTime;
     private _detectionsToday;
     private _currentIllumination;
-    private _lastBatteryLevel;
-    private _batteryLevelCallbacks;
     constructor(pInfo: IoBrokerDeviceInfo);
-    get lastBatteryPersist(): number;
-    get battery(): number;
+    get batteryLevel(): number;
     get timeSinceLastMotion(): number;
     get detectionsToday(): number;
     set detectionsToday(pVal: number);
     get currentIllumination(): number;
     private set currentIllumination(value);
-    /** @inheritDoc */
-    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
     addMovementCallback(pCallback: (action: MotionSensorAction) => void): void;
     /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     updatePresence(pVal: boolean): void;
     persistMotionSensor(): void;
-    persistBatteryDevice(): void;
-    /**
-     * Checks whether the battery level did change and if so fires the callbacks
-     */
-    private checkForBatteryChange;
 }