hoffmation-base 3.0.0-alpha.41 → 3.0.0-alpha.43

package/lib/index.js

@@ -92,9 +92,6 @@ class HoffmationBase {
             server_1.DaikinService.addOwnDevices(server_1.OwnAcDevices.ownDevices);
             server_1.DaikinService.initialize();
         }
-        if (server_1.SettingsService.settings.dachs !== undefined) {
-            server_1.Devices.dachs = new dachs_1.Dachs(server_1.SettingsService.settings.dachs);
-        }
         server_1.Utils.guardedNewThread(() => {
             if (server_1.SettingsService.settings.muell) {
                 server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Muell settings detected --> initializing');
@@ -117,6 +114,12 @@ class HoffmationBase {
                 server_1.VictronService.initialize(server_1.SettingsService.settings.victron);
             }
         });
+        server_1.Utils.guardedNewThread(() => {
+            if (server_1.SettingsService.settings.dachs !== undefined) {
+                server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Dachs settings detected --> initializing');
+                server_1.Devices.dachs = new dachs_1.Dachs(server_1.SettingsService.settings.dachs);
+            }
+        });
         if (server_1.SettingsService.TelegramActive)
             server_1.TelegramService.publishCommands();
         server_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'Hoffmation-Base Post ioBrokerInitializations finished');

package/lib/models/action/batteryLevelChangeAction.d.ts

@@ -0,0 +1,13 @@
+import { BaseAction } from './baseAction';
+import { CommandType } from '../command';
+import { iBatteryDevice } from '../../server';
+export declare class BatteryLevelChangeAction extends BaseAction {
+    /** @inheritDoc */
+    type: CommandType;
+    /**
+     * The new level (0 empty, 100 full)
+     * @type {number}
+     */
+    readonly newLevel: number;
+    constructor(device: iBatteryDevice);
+}

package/lib/models/action/batteryLevelChangeAction.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BatteryLevelChangeAction = void 0;
+const baseAction_1 = require("./baseAction");
+const command_1 = require("../command");
+class BatteryLevelChangeAction extends baseAction_1.BaseAction {
+    constructor(device) {
+        super(undefined, `New Battery Level received`);
+        /** @inheritDoc */
+        this.type = command_1.CommandType.BatteryManagerLevelChangeAction;
+        this.newLevel = device.battery;
+    }
+}
+exports.BatteryLevelChangeAction = BatteryLevelChangeAction;

package/lib/models/action/index.d.ts

@@ -5,3 +5,4 @@ export * from './presenceGroupLastLeftAction';
 export * from './presenceGroupFirstEnterAction';
 export * from './shutterPositionChangedAction';
 export * from './temperatureSensorChangeAction';
+export { BatteryLevelChangeAction } from './batteryLevelChangeAction';

package/lib/models/action/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseAction = void 0;
+exports.BatteryLevelChangeAction = exports.BaseAction = void 0;
 var baseAction_1 = require("./baseAction");
 Object.defineProperty(exports, "BaseAction", { enumerable: true, get: function () { return baseAction_1.BaseAction; } });
 __exportStar(require("./humiditySensorChangeAction"), exports);
@@ -23,3 +23,5 @@ __exportStar(require("./presenceGroupLastLeftAction"), exports);
 __exportStar(require("./presenceGroupFirstEnterAction"), exports);
 __exportStar(require("./shutterPositionChangedAction"), exports);
 __exportStar(require("./temperatureSensorChangeAction"), exports);
+var batteryLevelChangeAction_1 = require("./batteryLevelChangeAction");
+Object.defineProperty(exports, "BatteryLevelChangeAction", { enumerable: true, get: function () { return batteryLevelChangeAction_1.BatteryLevelChangeAction; } });

package/lib/models/command/blockAutomaticUntilCommand.js

@@ -26,7 +26,7 @@ class BlockAutomaticUntilCommand extends baseCommand_1.BaseCommand {
             (_f = revertToAutomaticAtBlockLift !== null && revertToAutomaticAtBlockLift !== void 0 ? revertToAutomaticAtBlockLift : (_e = (_d = server_1.SettingsService.settings) === null || _d === void 0 ? void 0 : _d.blockAutomaticHandlerDefaults) === null || _e === void 0 ? void 0 : _e.revertToAutomaticAtBlockLift) !== null && _f !== void 0 ? _f : true;
     }
     get logMessage() {
-        return `Block automatic until ${this.targetDate.toISOString()}, reason: ${this.reasonTrace}`;
+        return `Block automatic until ${this.targetDate.toLocaleString('de-DE')}, reason: ${this.reasonTrace}`;
     }
 }
 exports.BlockAutomaticUntilCommand = BlockAutomaticUntilCommand;

package/lib/models/command/commandType.d.ts

@@ -1,4 +1,5 @@
 export declare enum CommandType {
+    BatteryManagerLevelChangeAction = "BatteryManagerLevelChangeAction",
     BlockAutomaticLiftBlockCommand = "BlockAutomaticLiftBlockCommand",
     BlockAutomaticCommand = "BlockAutomaticCommand",
     BlockAutomaticUntilCommand = "BlockAutomaticUntilCommand",

package/lib/models/command/commandType.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandType = void 0;
 var CommandType;
 (function (CommandType) {
+    CommandType["BatteryManagerLevelChangeAction"] = "BatteryManagerLevelChangeAction";
     CommandType["BlockAutomaticLiftBlockCommand"] = "BlockAutomaticLiftBlockCommand";
     CommandType["BlockAutomaticCommand"] = "BlockAutomaticCommand";
     CommandType["BlockAutomaticUntilCommand"] = "BlockAutomaticUntilCommand";

package/lib/models/deviceSettings/dachsSettings.d.ts

@@ -4,6 +4,14 @@ export declare class DachsDeviceSettings extends ActuatorSettings {
      * The refresh interval in ms to pull the data from the device.
      */
     refreshInterval: number;
+    /**
+     * Defines the battery level at which the dachs should be turned on,
+     * to prevent a battery based island-system to be out of power.
+     * @default -1 --> No turn on for battery loading
+     *
+     * Uses {@link iBatteryDevice.addBatteryLevelCallback}
+     */
+    batteryLevelTurnOnThreshold: number;
     fromPartialObject(data: Partial<DachsDeviceSettings>): void;
     protected toJSON(): Partial<DachsDeviceSettings>;
 }

package/lib/models/deviceSettings/dachsSettings.js

@@ -10,10 +10,19 @@ class DachsDeviceSettings extends actuatorSettings_1.ActuatorSettings {
          * The refresh interval in ms to pull the data from the device.
          */
         this.refreshInterval = 30000;
+        /**
+         * Defines the battery level at which the dachs should be turned on,
+         * to prevent a battery based island-system to be out of power.
+         * @default -1 --> No turn on for battery loading
+         *
+         * Uses {@link iBatteryDevice.addBatteryLevelCallback}
+         */
+        this.batteryLevelTurnOnThreshold = -1;
     }
     fromPartialObject(data) {
-        var _a;
+        var _a, _b;
         this.refreshInterval = (_a = data.refreshInterval) !== null && _a !== void 0 ? _a : this.refreshInterval;
+        this.batteryLevelTurnOnThreshold = (_b = data.batteryLevelTurnOnThreshold) !== null && _b !== void 0 ? _b : this.batteryLevelTurnOnThreshold;
         super.fromPartialObject(data);
     }
     toJSON() {

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

@@ -1,21 +1,27 @@
-import { iRoomDevice } from './iRoomDevice';
+import { BatteryLevelChangeAction } from '../../../models';
+import { iBaseDevice } from './iBaseDevice';
 /**
  * Interface for Battery Devices.
  * A battery device can be any device that is powered by a battery e.g. a remote, a sensor, etc.
  *
  * For devices with {@link DeviceCapability.battery} capability.
  */
-export interface iBatteryDevice extends iRoomDevice {
+export interface iBatteryDevice extends iBaseDevice {
     /**
      * The last time the battery was persisted (in milliseconds since 1970)
      */
     readonly lastBatteryPersist: number;
     /**
-     * The battery status of the device in percentage
+     * The battery status of the device in percentage (0 empty - 100 full)
      */
     readonly battery: number;
     /**
      * Method to persist the battery status of the device to the persistence layer
      */
     persistBatteryDevice(): void;
+    /**
+     * Adds a callback for when the battery-level has Changed.
+     * @param pCallback - Function that accepts the new state as parameter
+     */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
 }

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

@@ -1,6 +1,5 @@
-import { DeviceInfo, DeviceType, iActuator, iBaseDevice } from '../../devices';
+import { DeviceCapability, DeviceInfo, DeviceType, iActuator, iBaseDevice } from '../../devices';
 import { ActuatorSetStateCommand, ActuatorToggleCommand, ActuatorWriteStateToDeviceCommand, LogLevel, RestoreTargetAutomaticValueCommand, RoomBase } from '../../../models';
-import { DeviceCapability } from '../DeviceCapability';
 import { LogDebugType, OwnSonosDevice } from '../../services';
 import { iDachsSettings } from '../../config/iDachsSettings';
 import { DachsDeviceSettings } from '../../../models/deviceSettings/dachsSettings';
@@ -66,4 +65,9 @@ export declare class Dachs implements iBaseDevice, iActuator {
     toggleActuator(c: ActuatorToggleCommand): boolean;
     /** @inheritDoc */
     writeActuatorStateToDevice(c: ActuatorWriteStateToDeviceCommand): void;
+    /**
+     * Reacts on level Changes of a Energymanager with battery
+     * @param {BatteryLevelChangeAction} action - The action containing the new level
+     */
+    private onBatteryLevelChange;
 }

package/lib/server/devices/dachs/dachs.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Dachs = void 0;
 const devices_1 = require("../../devices");
 const models_1 = require("../../../models");
-const DeviceCapability_1 = require("../DeviceCapability");
 const services_1 = require("../../services");
 const lodash_1 = __importDefault(require("lodash"));
 const dachsSettings_1 = require("../../../models/deviceSettings/dachsSettings");
@@ -23,6 +22,7 @@ class Dachs {
         return this._dachsOn;
     }
     constructor(options) {
+        var _a, _b;
         /** @inheritDoc */
         this.settings = new dachsSettings_1.DachsDeviceSettings();
         /** @inheritDoc */
@@ -36,7 +36,7 @@ class Dachs {
         this._dachsOn = false;
         this._tempWarmWater = 0;
         this._tempHeatStorage = 0;
-        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.actuator);
+        this.deviceCapabilities.push(devices_1.DeviceCapability.actuator);
         this._info = new devices_1.DeviceInfo();
         this._info.fullName = 'Dachs';
         this._info.customName = `Dachs ${options.roomName}`;
@@ -58,6 +58,10 @@ class Dachs {
         this.heatStorageTempSensor = new dachsTemperatureSensor_1.DachsTemperatureSensor(this.config.roomName, 'hs', 'Heat Storage Temperature');
         services_1.Utils.guardedInterval(this.loadData, this.config.refreshInterval, this);
         this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));
+        if ((_b = (_a = devices_1.Devices.energymanager) === null || _a === void 0 ? void 0 : _a.deviceCapabilities) === null || _b === void 0 ? void 0 : _b.includes(devices_1.DeviceCapability.batteryDriven)) {
+            const energyManager = devices_1.Devices.energymanager;
+            energyManager.addBatteryLevelCallback(this.onBatteryLevelChange.bind(this));
+        }
     }
     /** @inheritDoc */
     get info() {
@@ -177,5 +181,18 @@ class Dachs {
             this.log(models_1.LogLevel.Error, `Error while turning on Dachs: ${error}`);
         });
     }
+    /**
+     * Reacts on level Changes of a Energymanager with battery
+     * @param {BatteryLevelChangeAction} action - The action containing the new level
+     */
+    onBatteryLevelChange(action) {
+        if (this._dachsOn || this.settings.batteryLevelTurnOnThreshold < action.newLevel) {
+            // We are already running, or battery level is high enough.
+            return;
+        }
+        const setStateCommand = new models_1.ActuatorSetStateCommand(action, true, 'Energy Level of battery dropped to critical level', null);
+        setStateCommand.overrideCommandSource = models_1.CommandSource.Force;
+        this.setActuator(setStateCommand);
+    }
 }
 exports.Dachs = Dachs;

package/lib/server/devices/groups/lightGroup.js

@@ -58,7 +58,6 @@ class LightGroup extends base_group_1.BaseGroup {
         });
     }
     switchTimeConditional(c) {
-        const darkOutside = services_1.TimeCallbackService.darkOutsideOrNight(c.time);
         let resultLampen = false;
         let resultSteckdosen = false;
         let activatedGroups = 0;
@@ -80,11 +79,11 @@ class LightGroup extends base_group_1.BaseGroup {
         if (this.getOutlets().length > 0) {
             activatedGroups++;
             this.log(models_1.LogLevel.Trace, `Set outlets time based for time "${models_1.TimeOfDay[c.time]}"`);
-            resultSteckdosen = darkOutside;
+            resultSteckdosen = true;
         }
         if (activatedGroups === 0 || this.getRoom().settings.includeLampsInNormalMovementLightning) {
             this.log(models_1.LogLevel.Trace, `Set Lamps time based for time "${models_1.TimeOfDay[c.time]}"`);
-            resultLampen = darkOutside;
+            resultLampen = true;
         }
         if (resultLampen) {
             this.setAllLampenTimeBased(new models_1.LampSetTimeBasedCommand(c, c.time));

package/lib/server/devices/groups/presenceGroup.js

@@ -22,19 +22,21 @@ class PresenceGroup extends base_group_1.BaseGroup {
     initCallbacks() {
         this.getMotionDetector().forEach((b) => {
             b.addMovementCallback((action) => {
-                if (action.motionDetected) {
-                    this.motionSensorOnAnyMovement(action);
+                if (!action.motionDetected && !this.anyPresent()) {
+                    this.motionSensorOnLastLeft(action);
+                    return;
                 }
-                if (action.motionDetected || this.anyPresent()) {
-                    // TODO: Possible Edge Case, if the other motion sensor doesn't fire motion end event this will never be called
+                if (!action.motionDetected && this.anyPresent()) {
                     this.resetLastLeftTimeout();
+                    return;
                 }
-                else if (!action.motionDetected && !this.anyPresent()) {
-                    this.motionSensorOnLastLeft(action);
-                }
-                if (action.motionDetected && this.presentAmount() === 1 && this._lastLeftTimeout === null) {
+                // At this Point we can be certain about motion being detected.
+                this.log(models_1.LogLevel.Debug, `New Motion detected, present Amount: ${this.presentAmount()}`, services_1.LogDebugType.NewMovementState);
+                this.motionSensorOnAnyMovement(action);
+                if (this.presentAmount() === 1 && this._lastLeftTimeout === null) {
                     this.fireFistEnterCBs(action);
                 }
+                this.resetLastLeftTimeout();
             });
         });
         this.addLastLeftCallback((action) => {
@@ -110,9 +112,11 @@ class PresenceGroup extends base_group_1.BaseGroup {
      * In case of an existing delayed last left callback timeout, this removes it.
      */
     resetLastLeftTimeout() {
-        if (this._lastLeftTimeout !== null) {
-            clearTimeout(this._lastLeftTimeout);
+        if (this._lastLeftTimeout === null) {
+            return;
         }
+        clearTimeout(this._lastLeftTimeout);
+        this._lastLeftTimeout = null;
     }
     executeLastLeftCbs(action) {
         for (const cb of this._lastLeftCbs) {

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

@@ -1,6 +1,7 @@
 import { iDisposable } from '../../services';
 import { WindowPosition } from '../models';
 import { Window } from '../groups';
+import { BatteryLevelChangeAction } from '../../../models';
 import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { HmIPDevice } from './hmIpDevice';
@@ -22,6 +23,8 @@ export declare class HmIpGriff extends HmIPDevice implements iHandleSensor, iBat
     private _iOpenTimeout;
     private _window;
     private _helpingRoomTemp;
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
     /**
      * Creates an instance of {@link DeviceType.HmIpGriff}.
      * @param pInfo - Device creation information
@@ -36,6 +39,8 @@ export declare class HmIpGriff extends HmIPDevice implements iHandleSensor, iBat
      */
     set window(value: Window);
     /** @inheritDoc */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
+    /** @inheritDoc */
     addOffenCallback(pCallback: (pValue: boolean) => void): void;
     /** @inheritDoc */
     addKippCallback(pCallback: (pValue: boolean) => void): void;
@@ -54,4 +59,8 @@ export declare class HmIpGriff extends HmIPDevice implements iHandleSensor, iBat
     /** @inheritDoc */
     toJSON(): Partial<IoBrokerBaseDevice>;
     private updatePosition;
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    private checkForBatteryChange;
 }

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

@@ -33,6 +33,8 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
         this._offenCallback = [];
         this._window = undefined;
         this._helpingRoomTemp = false;
+        this._lastBatteryLevel = -1;
+        this._batteryLevelCallbacks = [];
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.handleSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
     }
@@ -51,6 +53,10 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
         this._window = value;
     }
     /** @inheritDoc */
+    addBatteryLevelCallback(pCallback) {
+        this._batteryLevelCallbacks.push(pCallback);
+    }
+    /** @inheritDoc */
     addOffenCallback(pCallback) {
         this._offenCallback.push(pCallback);
     }
@@ -71,6 +77,7 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
                 switch (idSplit[4]) {
                     case 'OPERATING_VOLTAGE':
                         this._battery = 100 * ((state.val - 0.9) / 0.6);
+                        this.checkForBatteryChange();
                         this.persistBatteryDevice();
                         break;
                 }
@@ -82,6 +89,7 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
                         break;
                     case 'OPERATING_VOLTAGE':
                         this._battery = 100 * ((state.val - 0.9) / 0.6);
+                        this.checkForBatteryChange();
                         this.persistBatteryDevice();
                         break;
                 }
@@ -205,5 +213,18 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
             }
         }, 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;
+    }
 }
 exports.HmIpGriff = HmIpGriff;

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

@@ -1,3 +1,4 @@
+import { BatteryLevelChangeAction } from '../../../models';
 import { HmIPDevice } from './hmIpDevice';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { iBatteryDevice } from '../baseDeviceInterfaces';
@@ -7,15 +8,23 @@ export declare class HmIpHeizung extends HmIPDevice implements iBatteryDevice {
     private _level;
     private _adaptionState;
     private _lastBatteryPersist;
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
+    private _desiredTemperatur;
+    constructor(pInfo: IoBrokerDeviceInfo);
     get lastBatteryPersist(): number;
     get battery(): number;
-    constructor(pInfo: IoBrokerDeviceInfo);
-    private _desiredTemperatur;
     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;
-    private updateBaseInformation;
     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

@@ -19,21 +19,23 @@ var HmIpHeizungAdaptionStates;
     HmIpHeizungAdaptionStates[HmIpHeizungAdaptionStates["ErrorPosition"] = 8] = "ErrorPosition";
 })(HmIpHeizungAdaptionStates || (HmIpHeizungAdaptionStates = {}));
 class HmIpHeizung extends hmIpDevice_1.HmIPDevice {
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    get battery() {
-        return this._battery;
-    }
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpHeizung);
         this._battery = -99;
         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 desiredTemperatur() {
         return this._desiredTemperatur;
     }
@@ -44,6 +46,10 @@ 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);
@@ -52,6 +58,7 @@ class HmIpHeizung extends hmIpDevice_1.HmIPDevice {
                 switch (idSplit[4]) {
                     case 'OPERATING_VOLTAGE':
                         this._battery = 100 * ((state.val - 1.8) / 1.2);
+                        this.checkForBatteryChange();
                         this.persistBatteryDevice();
                         break;
                 }
@@ -61,6 +68,15 @@ 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':
@@ -82,14 +98,18 @@ class HmIpHeizung extends hmIpDevice_1.HmIPDevice {
                 break;
         }
     }
-    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.HmIpHeizung = HmIpHeizung;

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

@@ -1,5 +1,5 @@
 import { HmIPDevice } from './hmIpDevice';
-import { MotionSensorAction, MotionSensorSettings } from '../../../models';
+import { BatteryLevelChangeAction, MotionSensorAction, MotionSensorSettings } from '../../../models';
 import { iBatteryDevice, iIlluminationSensor, iMotionSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpPraezenz extends HmIPDevice implements iIlluminationSensor, iBatteryDevice, iMotionSensor {
@@ -16,6 +16,8 @@ export declare class HmIpPraezenz extends HmIPDevice implements iIlluminationSen
     private _lastMotionTime;
     private _detectionsToday;
     private _currentIllumination;
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
     constructor(pInfo: IoBrokerDeviceInfo);
     get lastBatteryPersist(): number;
     get battery(): number;
@@ -24,10 +26,16 @@ export declare class HmIpPraezenz extends HmIPDevice implements iIlluminationSen
     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;
 }

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

@@ -22,6 +22,8 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
         this._lastMotionTime = 0;
         this._detectionsToday = 0;
         this._currentIllumination = -1;
+        this._lastBatteryLevel = -1;
+        this._batteryLevelCallbacks = [];
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.illuminationSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.motionSensor);
@@ -63,6 +65,10 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
         this._currentIllumination = value;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistIlluminationSensor(this);
     }
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback) {
+        this._batteryLevelCallbacks.push(pCallback);
+    }
     addMovementCallback(pCallback) {
         this._movementDetectedCallback.push(pCallback);
     }
@@ -75,6 +81,7 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
                 switch (idSplit[4]) {
                     case 'OPERATING_VOLTAGE':
                         this._battery = 100 * ((state.val - 1.8) / 1.2);
+                        this.checkForBatteryChange();
                         this.persistBatteryDevice();
                         break;
                 }
@@ -128,6 +135,19 @@ class HmIpPraezenz 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.HmIpPraezenz = HmIpPraezenz;
 // TODO: Add iPresenceSensor

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

@@ -1,11 +1,9 @@
 import { HmIPDevice } from './hmIpDevice';
 import { iBatteryDevice, iButtonSwitch } from '../baseDeviceInterfaces';
 import { Button, ButtonPosition, ButtonPressType } from '../button';
+import { BatteryLevelChangeAction } from '../../../models';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpTaster extends HmIPDevice implements iButtonSwitch, iBatteryDevice {
-    private _battery;
-    private _lastBatteryPersist;
-    get lastBatteryPersist(): number;
     private static readonly BUTTON_CAPABILLITIES;
     /** @inheritDoc */
     buttonTopLeft: Button;
@@ -29,12 +27,23 @@ export declare class HmIpTaster extends HmIPDevice implements iButtonSwitch, iBa
      * @inheritDoc
      */
     buttonTop: undefined;
-    get battery(): number;
+    private _battery;
+    private _lastBatteryPersist;
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
     constructor(pInfo: IoBrokerDeviceInfo);
+    get lastBatteryPersist(): number;
+    get battery(): number;
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
     persist(buttonName: string, pressType: ButtonPressType): void;
     /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     getButtonAssignment(): string;
     persistBatteryDevice(): void;
     pressButton(position: ButtonPosition, pressType: ButtonPressType): Error | null;
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    private checkForBatteryChange;
 }