hoffmation-base 3.0.0-alpha.8 → 3.0.0-alpha.81

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

@@ -13,40 +13,62 @@ const hmIpDevice_1 = require("./hmIpDevice");
 const DeviceCapability_1 = require("../DeviceCapability");
 const handleSettings_1 = require("../../../models/deviceSettings/handleSettings");
 class HmIpGriff extends hmIpDevice_1.HmIPDevice {
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    get battery() {
-        return this._battery;
-    }
+    /**
+     * Creates an instance of {@link DeviceType.HmIpGriff}.
+     * @param pInfo - Device creation information
+     */
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpGriff);
+        /** @inheritDoc */
         this.settings = new handleSettings_1.HandleSettings();
+        /** @inheritDoc */
+        this.position = models_1.WindowPosition.geschlossen;
+        /** @inheritDoc */
+        this.minutesOpen = 0;
         this._battery = -99;
         this._lastBatteryPersist = 0;
         this._lastHandlePersist = 0;
-        this.position = models_1.WindowPosition.geschlossen;
         this._kippCallback = [];
         this._closedCallback = [];
         this._offenCallback = [];
-        this.minutesOpen = 0;
         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);
     }
+    /** @inheritDoc */
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
+    /** @inheritDoc */
+    get battery() {
+        return this._battery;
+    }
+    /**
+     * Adds a window to this device
+     */
     set window(value) {
         this._window = value;
     }
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback) {
+        this._batteryLevelCallbacks.push(pCallback);
+    }
+    /** @inheritDoc */
     addOffenCallback(pCallback) {
         this._offenCallback.push(pCallback);
     }
+    /** @inheritDoc */
     addKippCallback(pCallback) {
         this._kippCallback.push(pCallback);
     }
+    /** @inheritDoc */
     addClosedCallback(pCallback) {
         this._closedCallback.push(pCallback);
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_2.LogLevel.DeepTrace, `Griff Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
         super.update(idSplit, state, initial, true);
@@ -55,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;
                 }
@@ -66,12 +89,47 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
                         break;
                     case 'OPERATING_VOLTAGE':
                         this._battery = 100 * ((state.val - 0.9) / 0.6);
+                        this.checkForBatteryChange();
                         this.persistBatteryDevice();
                         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) {
@@ -116,7 +174,7 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
                     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.`;
+                        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);
@@ -155,33 +213,18 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
             }
         }, 60000, this);
     }
-    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;
-    }
-    persistHandleSensor() {
-        var _a;
-        const now = services_1.Utils.nowMS();
-        if (this._lastHandlePersist + 2000 > 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;
         }
-        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;
-    }
-    dispose() {
-        if (this._iOpenTimeout) {
-            clearInterval(this._iOpenTimeout);
-            this._iOpenTimeout = undefined;
+        for (const cb of this._batteryLevelCallbacks) {
+            cb(new models_2.BatteryLevelChangeAction(this));
         }
-    }
-    toJSON() {
-        return lodash_1.default.omit(super.toJSON(), ['_window']);
+        this._lastBatteryLevel = newLevel;
     }
 }
 exports.HmIpGriff = HmIpGriff;

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

@@ -1,13 +1,16 @@
-/// <reference types="node" />
 import { HmIPDevice } from './hmIpDevice';
 import { iDisposable } from '../../services';
-import { HeaterSettings } from '../../../models';
+import { HeaterSettings, HumiditySensorChangeAction, TemperatureSensorChangeAction } from '../../../models';
 import { iHeater, iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSensor, iHumiditySensor, iHeater, iDisposable {
+    /** @inheritDoc */
     readonly persistHeaterInterval: NodeJS.Timeout;
+    /** @inheritDoc */
     readonly persistTemperatureSensorInterval: NodeJS.Timeout;
+    /** @inheritDoc */
     readonly persistHumiditySensorInterval: NodeJS.Timeout;
+    /** @inheritDoc */
     settings: HeaterSettings;
     private _iAutomaticInterval;
     private _initialSeasonCheckDone;
@@ -17,35 +20,51 @@ export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSe
     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;
+    /** @inheritDoc */
     set desiredTemperature(val: number);
     get sLevel(): string;
+    /** @inheritDoc */
     get iLevel(): number;
+    /** @inheritDoc */
     get sTemperature(): string;
+    /** @inheritDoc */
     get iTemperature(): number;
     private _roomTemperature;
+    /** @inheritDoc */
     get roomTemperature(): number;
-    set roomTemperature(value: number);
-    addHumidityCallback(pCallback: (pValue: number) => void): void;
+    /** @inheritDoc */
+    addHumidityCallback(pCallback: (action: HumiditySensorChangeAction) => void): void;
     getBelongingHeizungen(): iHeater[];
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
-    stopAutomaticCheck(): void;
+    /** @inheritDoc */
     checkAutomaticChange(): void;
-    addTempChangeCallback(pCallback: (pValue: number) => void): void;
+    /** @inheritDoc */
+    addTempChangeCallback(pCallback: (action: TemperatureSensorChangeAction) => void): void;
+    /** @inheritDoc */
     onTemperaturChange(newTemperatur: number): void;
+    /** @inheritDoc */
     persistTemperaturSensor(): void;
+    /** @inheritDoc */
     persistHeater(): void;
+    /** @inheritDoc */
     persistHumiditySensor(): void;
     private updateBaseInformation;
     private checkSeasonTurnOff;
+    /** @inheritDoc */
     dispose(): void;
 }

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

@@ -11,15 +11,19 @@ const DeviceCapability_1 = require("../DeviceCapability");
 class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpHeizgruppe);
+        /** @inheritDoc */
         this.persistHeaterInterval = services_1.Utils.guardedInterval(() => {
             this.persistHeater();
         }, 5 * 60 * 1000, this, false);
+        /** @inheritDoc */
         this.persistTemperatureSensorInterval = services_1.Utils.guardedInterval(() => {
             this.persistTemperaturSensor();
         }, 5 * 60 * 1000, this, false);
+        /** @inheritDoc */
         this.persistHumiditySensorInterval = services_1.Utils.guardedInterval(() => {
             this.persistHumiditySensor();
         }, 5 * 60 * 1000, this, false);
+        /** @inheritDoc */
         this.settings = new models_1.HeaterSettings();
         this._initialSeasonCheckDone = false;
         this._level = 0;
@@ -40,9 +44,11 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
             this.checkSeasonTurnOff();
         }, 0, 2, 0));
     }
+    /** @inheritDoc */
     get seasonTurnOff() {
         return this._seasonTurnOff;
     }
+    /** @inheritDoc */
     set seasonTurnOff(value) {
         this._seasonTurnOff = value;
         if (value) {
@@ -61,21 +67,24 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     set temperature(val) {
         this._temperature = val;
         for (const cb of this._temperatureCallbacks) {
-            cb(val);
+            cb(new models_1.TemperatureSensorChangeAction(this, val));
         }
     }
+    /** @inheritDoc */
     get humidity() {
         return this._humidity;
     }
     set humidity(val) {
         this._humidity = val;
         for (const cb of this._humidityCallbacks) {
-            cb(val);
+            cb(new models_1.HumiditySensorChangeAction(this, val));
         }
     }
+    /** @inheritDoc */
     get desiredTemperature() {
         return this._desiredTemperature;
     }
+    /** @inheritDoc */
     set desiredTemperature(val) {
         this.setState(this._setPointTemperatureID, this.seasonTurnOff ? 5 : val, () => {
             this.log(models_1.LogLevel.Info, `Changed temperature of to "${val}.`);
@@ -86,30 +95,33 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     get sLevel() {
         return `${this._level * 100}%`;
     }
+    /** @inheritDoc */
     get iLevel() {
         return this._level;
     }
+    /** @inheritDoc */
     get sTemperature() {
         return `${this.temperature}°C`;
     }
+    /** @inheritDoc */
     get iTemperature() {
         return this.temperature;
     }
+    /** @inheritDoc */
     get roomTemperature() {
         return this._roomTemperature;
     }
-    set roomTemperature(value) {
-        this._roomTemperature = value;
-    }
+    /** @inheritDoc */
     addHumidityCallback(pCallback) {
         this._humidityCallbacks.push(pCallback);
         if (this._humidity > 0) {
-            pCallback(this._humidity);
+            pCallback(new models_1.HumiditySensorChangeAction(this, this._humidity));
         }
     }
     getBelongingHeizungen() {
         return this.room.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Heater);
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Heizgruppe Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
@@ -119,12 +131,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
                 break;
         }
     }
-    stopAutomaticCheck() {
-        if (this._iAutomaticInterval !== undefined) {
-            clearInterval(this._iAutomaticInterval);
-            this._iAutomaticInterval = undefined;
-        }
-    }
+    /** @inheritDoc */
     checkAutomaticChange() {
         var _a, _b, _c, _d;
         if (!this._initialSeasonCheckDone) {
@@ -144,23 +151,28 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
             this.desiredTemperature = targetTemp;
         }
     }
+    /** @inheritDoc */
     addTempChangeCallback(pCallback) {
         this._temperatureCallbacks.push(pCallback);
         if (this._temperature > baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
-            pCallback(this._temperature);
+            pCallback(new models_1.TemperatureSensorChangeAction(this, this._temperature));
         }
     }
+    /** @inheritDoc */
     onTemperaturChange(newTemperatur) {
-        this.roomTemperature = newTemperatur;
+        this._roomTemperature = newTemperatur;
     }
+    /** @inheritDoc */
     persistTemperaturSensor() {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistTemperatureSensor(this);
     }
+    /** @inheritDoc */
     persistHeater() {
         var _a;
         (_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);
@@ -190,6 +202,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         }
         this._initialSeasonCheckDone = true;
     }
+    /** @inheritDoc */
     dispose() {
         if (this.persistTemperatureSensorInterval) {
             clearInterval(this.persistTemperatureSensorInterval);

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,14 +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;
     }
@@ -43,6 +45,11 @@ class HmIpHeizung extends hmIpDevice_1.HmIPDevice {
     get iTemperatur() {
         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);
@@ -51,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;
                 }
@@ -60,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':
@@ -81,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/hmIpLampe.d.ts

@@ -4,15 +4,21 @@ import { iLamp, iTemporaryDisableAutomatic } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { BlockAutomaticHandler } from '../../services/blockAutomaticHandler';
 export declare class HmIpLampe extends HmIPDevice implements iLamp, iTemporaryDisableAutomatic {
-    lightOn: boolean;
+    /** @inheritDoc */
+    private _actuatorOn;
+    /** @inheritDoc */
     settings: ActuatorSettings;
     private lightOnSwitchID;
+    /** @inheritDoc */
     readonly blockAutomationHandler: BlockAutomaticHandler;
+    /** @inheritDoc */
     queuedValue: boolean | null;
+    /** @inheritDoc */
     targetAutomaticState: boolean;
     constructor(pInfo: IoBrokerDeviceInfo);
     get actuatorOn(): boolean;
     restoreTargetAutomaticValue(c: RestoreTargetAutomaticValueCommand): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     setActuator(command: ActuatorSetStateCommand): void;
     toggleActuator(c: ActuatorToggleCommand): boolean;

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

@@ -11,23 +11,27 @@ const sharedFunctions_1 = require("../sharedFunctions");
 class HmIpLampe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpLampe);
-        this.lightOn = false;
+        /** @inheritDoc */
+        this._actuatorOn = false;
+        /** @inheritDoc */
         this.settings = new models_1.ActuatorSettings();
         this.lightOnSwitchID = '';
+        /** @inheritDoc */
         this.queuedValue = null;
+        /** @inheritDoc */
         this.targetAutomaticState = false;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.blockAutomatic);
         this.lightOnSwitchID = `${this.info.fullID}.2.STATE`;
-        this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this));
+        this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));
     }
     get actuatorOn() {
-        return this.lightOn;
+        return this._actuatorOn;
     }
     restoreTargetAutomaticValue(c) {
-        this.log(models_1.LogLevel.Debug, c.logMessage);
-        this.setLight(new models_1.LampSetLightCommand(c, this.targetAutomaticState, 'Lampen RestoreTargetAutomaticValue'));
+        this.setLight(new models_1.LampSetLightCommand(c, this.targetAutomaticState));
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Lampen Update : ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         this.queuedValue = null;
@@ -35,7 +39,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
         switch (idSplit[3]) {
             case '1':
                 if (idSplit[4] === 'STATE') {
-                    this.lightOn = state.val;
+                    this._actuatorOn = state.val;
                     this.persist();
                 }
                 break;
@@ -52,7 +56,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
     /** @inheritdoc */
     setLight(c) {
         if (this.lightOnSwitchID === '') {
-            this.log(models_1.LogLevel.Error, `Keine Switch ID bekannt.`);
+            this.log(models_1.LogLevel.Error, 'Keine Switch ID bekannt.');
             return;
         }
         sharedFunctions_1.LampUtils.setActuator(this, c);

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

@@ -1,31 +1,41 @@
 import { HmIPDevice } from './hmIpDevice';
-import { 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 {
-    private _battery;
-    private _lastBatteryPersist;
-    get lastBatteryPersist(): number;
     private static PRESENCE_DETECTION;
     private static CURRENT_ILLUMINATION;
-    excludeFromNightAlarm: boolean;
+    /** @inheritDoc */
     movementDetected: boolean;
-    get battery(): number;
+    /** @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 timeSinceLastMotion(): number;
-    private _detectionsToday;
     get detectionsToday(): number;
     set detectionsToday(pVal: number);
-    private _currentIllumination;
     get currentIllumination(): number;
     private set currentIllumination(value);
-    addMovementCallback(pCallback: (pValue: boolean) => void): void;
+    /** @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;
 }