hoffmation-base 1.0.63 → 1.0.66

package/lib/index.js

@@ -36,10 +36,7 @@ class HoffmationBase {
         }
         server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Hoffmation-Base Startup`);
         if (initObject.config.persistence) {
-            if (initObject.config.persistence.mongo) {
-                server_1.Utils.dbo = new server_1.MongoPersistance(initObject.config.persistence);
-            }
-            else if (initObject.config.persistence.postgreSql) {
+            if (initObject.config.persistence.postgreSql) {
                 server_1.Utils.dbo = new server_1.PostgreSqlPersist(initObject.config.persistence);
             }
             await ((_a = server_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.initialize());

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

@@ -1,6 +1,5 @@
 export * from './BasicRoomInfo';
 export * from './CurrentIlluminationDataPoint';
-export * from './DailyMovementCount';
 export * from './EnergyCalculation';
 export * from './RoomDetailInfo';
 export * from './ShutterCalibration';

package/lib/models/persistence/index.js

@@ -16,7 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./BasicRoomInfo"), exports);
 __exportStar(require("./CurrentIlluminationDataPoint"), exports);
-__exportStar(require("./DailyMovementCount"), exports);
 __exportStar(require("./EnergyCalculation"), exports);
 __exportStar(require("./RoomDetailInfo"), exports);
 __exportStar(require("./ShutterCalibration"), exports);

package/lib/models/persistence/todaysCount.d.ts

@@ -1,5 +1,4 @@
 export declare class CountToday {
-    deviceID: string;
-    counter: number;
-    constructor(deviceID: string, counter: number);
+    count: number;
+    constructor(count: number);
 }

package/lib/models/persistence/todaysCount.js

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CountToday = void 0;
 class CountToday {
-    constructor(deviceID, counter) {
-        this.deviceID = deviceID;
-        this.counter = counter;
+    constructor(count) {
+        this.count = count;
     }
 }
 exports.CountToday = CountToday;

package/lib/server/config/iConfig.d.ts

@@ -76,13 +76,8 @@ export interface iTelegramSettings {
     subscribedIDs: number[];
 }
 export interface iPersistenceSettings {
-    mongo?: iMongoSettings;
     postgreSql?: PoolConfig;
 }
-export interface iMongoSettings {
-    mongoConnection: string;
-    mongoDbName: string;
-}
 export interface iPollySettings {
     mp3Path: string;
     region: string;

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

@@ -3,6 +3,7 @@ import { iRoomDevice } from './iRoomDevice';
 export interface iLamp extends iRoomDevice {
     settings: ActuatorSettings;
     lightOn: boolean;
+    persist(): void;
     setTimeBased(time: TimeOfDay, timeout: number, force: boolean): void;
     toggleLight(time: TimeOfDay, force: boolean, calculateTime: boolean): void;
     /**

package/lib/server/devices/device-cluster-type.d.ts

@@ -6,7 +6,6 @@ export declare enum DeviceClusterType {
     Lamps = 4,
     MotionDetection = 5,
     Outlets = 6,
-    PresenceDetection = 7,
     Speaker = 8,
     SmokeDetector = 9,
     WaterDetectors = 10,

package/lib/server/devices/device-cluster-type.js

@@ -10,7 +10,6 @@ var DeviceClusterType;
     DeviceClusterType[DeviceClusterType["Lamps"] = 4] = "Lamps";
     DeviceClusterType[DeviceClusterType["MotionDetection"] = 5] = "MotionDetection";
     DeviceClusterType[DeviceClusterType["Outlets"] = 6] = "Outlets";
-    DeviceClusterType[DeviceClusterType["PresenceDetection"] = 7] = "PresenceDetection";
     DeviceClusterType[DeviceClusterType["Speaker"] = 8] = "Speaker";
     DeviceClusterType[DeviceClusterType["SmokeDetector"] = 9] = "SmokeDetector";
     DeviceClusterType[DeviceClusterType["WaterDetectors"] = 10] = "WaterDetectors";

package/lib/server/devices/device-cluster.js

@@ -48,9 +48,6 @@ class DeviceCluster {
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.TemperaturSensor);
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.HumiditySensor);
                 break;
-            case deviceType_1.DeviceType.HmIpPraezenz:
-                clusterTypes.push(device_cluster_type_1.DeviceClusterType.PresenceDetection);
-                break;
             case deviceType_1.DeviceType.HmIpGriff:
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.Handle);
                 break;
@@ -67,6 +64,7 @@ class DeviceCluster {
             case deviceType_1.DeviceType.HmIpBewegung:
             case deviceType_1.DeviceType.ZigbeeAquaraMotion:
             case deviceType_1.DeviceType.ZigbeeSonoffMotion:
+            case deviceType_1.DeviceType.HmIpPraezenz:
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.MotionDetection);
                 break;
             case deviceType_1.DeviceType.ZigbeeIkeaSteckdose:

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

@@ -13,7 +13,7 @@ export declare class Devices {
         [id: string]: deviceConfig;
     }, pRoomImportEnforcer?: iRoomImportEnforcer);
     static midnightReset(): void;
-    static resetPraesenzCount(): void;
+    static resetDetectionsToday(): void;
     static getBatteryInfo(): string;
     private static processZigbeeDevice;
     private static processWledDevice;

package/lib/server/devices/devices.js

@@ -45,15 +45,12 @@ class Devices {
     static midnightReset() {
         // Nothing yet
     }
-    static resetPraesenzCount() {
-        services_1.ServerLogService.writeLog(models_1.LogLevel.Info, `3 Uhr Reset der Präsenzmelder`);
+    static resetDetectionsToday() {
+        services_1.ServerLogService.writeLog(models_1.LogLevel.Info, `3 o'clock reset of motion sensors`);
         for (const dID in Devices.alLDevices) {
             const d = Devices.alLDevices[dID];
-            if (d.deviceType === deviceType_1.DeviceType.HmIpPraezenz ||
-                d.deviceType === deviceType_1.DeviceType.HmIpBewegung ||
-                d.deviceType === deviceType_1.DeviceType.ZigbeeSonoffMotion ||
-                d.deviceType === deviceType_1.DeviceType.ZigbeeAquaraMotion) {
-                services_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `2 Uhr Reset der Tages Detektionen von ${d.info.customName}`);
+            if (d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.motionSensor)) {
+                d.log(models_1.LogLevel.Debug, `3 o'clock reset of detections`);
                 d.detectionsToday = 0;
             }
         }

package/lib/server/devices/groups/praesenzGroup.d.ts

@@ -1,12 +1,10 @@
-import { HmIpPraezenz } from '../hmIPDevices';
 import { BaseGroup } from './base-group';
 import { iMotionSensor } from '../baseDeviceInterfaces';
 export declare class PraesenzGroup extends BaseGroup {
     private _lastMovement;
     private _lastLeftTimeout;
-    constructor(roomName: string, presenceDetectorIds: string[], motionSensorIds: string[]);
+    constructor(roomName: string, motionSensorIds: string[]);
     getMotionDetector(): Array<iMotionSensor>;
-    getPresenceSensors(): HmIpPraezenz[];
     initCallbacks(): void;
     presentAmount(): number;
     anyPresent(): boolean;

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

@@ -8,31 +8,16 @@ const device_cluster_type_1 = require("../device-cluster-type");
 const group_type_1 = require("./group-type");
 const device_list_1 = require("../device-list");
 class PraesenzGroup extends base_group_1.BaseGroup {
-    constructor(roomName, presenceDetectorIds, motionSensorIds) {
+    constructor(roomName, motionSensorIds) {
         super(roomName, group_type_1.GroupType.Presence);
         this._lastMovement = new Date(0);
         this._lastLeftTimeout = null;
-        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.PresenceDetection, new device_list_1.DeviceList(presenceDetectorIds));
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.MotionDetection, new device_list_1.DeviceList(motionSensorIds));
     }
     getMotionDetector() {
-        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.MotionDetection);
-    }
-    getPresenceSensors() {
-        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.PresenceDetection);
+        return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.MotionDetection);
     }
     initCallbacks() {
-        this.getPresenceSensors().forEach((p) => {
-            p.addPresenceCallback((val) => {
-                if (!val) {
-                    return;
-                }
-                if (services_1.RoomService.awayModeActive || (services_1.RoomService.nightAlarmActive && !p.excludeFromNightAlarm)) {
-                    services_1.RoomService.startIntrusionAlarm(this.getRoom(), p);
-                }
-                services_1.RoomService.movementHistory.add(`${services_1.Utils.nowString()}: Raum "${this.roomName}" Gerät "${p.info.fullName}"`);
-            });
-        });
         this.getMotionDetector().forEach((b) => {
             b.addMovementCallback((val) => {
                 var _a;
@@ -69,11 +54,6 @@ class PraesenzGroup extends base_group_1.BaseGroup {
     }
     presentAmount() {
         let count = 0;
-        for (let i = 0; i < this.getPresenceSensors().length; i++) {
-            if (this.getPresenceSensors()[i].presenceDetected) {
-                count++;
-            }
-        }
         for (let i = 0; i < this.getMotionDetector().length; i++) {
             if (this.getMotionDetector()[i].movementDetected) {
                 count++;
@@ -82,11 +62,6 @@ class PraesenzGroup extends base_group_1.BaseGroup {
         return count;
     }
     anyPresent() {
-        for (let i = 0; i < this.getPresenceSensors().length; i++) {
-            if (this.getPresenceSensors()[i].presenceDetected) {
-                return true;
-            }
-        }
         for (let i = 0; i < this.getMotionDetector().length; i++) {
             if (this.getMotionDetector()[i].movementDetected) {
                 return true;
@@ -121,11 +96,6 @@ class PraesenzGroup extends base_group_1.BaseGroup {
         }, Math.abs(timeAfterReset) + 500, this);
     }
     addLastLeftCallback(cb) {
-        this.getPresenceSensors().forEach((p) => {
-            p.addPresenceCallback((val) => {
-                this.lastLeftCB(val, cb);
-            });
-        });
         this.getMotionDetector().forEach((b) => {
             b.addMovementCallback((val) => {
                 this.lastLeftCB(val, cb);
@@ -133,11 +103,6 @@ class PraesenzGroup extends base_group_1.BaseGroup {
         });
     }
     addFirstEnterCallback(cb) {
-        this.getPresenceSensors().forEach((p) => {
-            p.addPresenceCallback((val) => {
-                this.firstEnterCallback(val, cb);
-            });
-        });
         this.getMotionDetector().forEach((b) => {
             b.addMovementCallback((val) => {
                 this.firstEnterCallback(val, cb);

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

@@ -23,8 +23,8 @@ class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
             this.initialized = true;
         }
         else {
-            (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.getCount(this).then((todayCount) => {
-                this.detectionsToday = todayCount.counter;
+            (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.motionSensorTodayCount(this).then((todayCount) => {
+                this.detectionsToday = todayCount.count;
                 this.log(models_1.LogLevel.Debug, `Bewegungscounter vorinitialisiert mit ${this.detectionsToday}`);
                 this.initialized = true;
             }).catch((err) => {
@@ -40,10 +40,7 @@ class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
         return this._detectionsToday;
     }
     set detectionsToday(pVal) {
-        var _a;
-        const oldVal = this._detectionsToday;
         this._detectionsToday = pVal;
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistTodayCount(this, pVal, oldVal);
     }
     get currentIllumination() {
         return this._currentIllumination;

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

@@ -16,4 +16,5 @@ export declare class HmIpLampe extends HmIPDevice implements iLamp {
     setLight(pValue: boolean, timeout?: number, force?: boolean): void;
     toggleLight(time?: TimeOfDay, force?: boolean, calculateTime?: boolean): boolean;
     setTimeBased(time: TimeOfDay, timeout?: number, force?: boolean): void;
+    persist(): void;
 }

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

@@ -26,6 +26,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
             case '1':
                 if (idSplit[4] === 'STATE') {
                     this.lightOn = state.val;
+                    this.persist();
                 }
                 break;
         }
@@ -98,5 +99,9 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
             this.setLight(true, timeout, force);
         }
     }
+    persist() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistLamp(this);
+    }
 }
 exports.HmIpLampe = HmIpLampe;

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

@@ -1,23 +1,28 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
-import { iBatteryDevice, iIlluminationSensor } from '../baseDeviceInterfaces';
+import { MotionSensorSettings } from '../../../models';
+import { iBatteryDevice, iIlluminationSensor, iMotionSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-export declare class HmIpPraezenz extends HmIPDevice implements iIlluminationSensor, iBatteryDevice {
+export declare class HmIpPraezenz extends HmIPDevice implements iIlluminationSensor, iBatteryDevice, iMotionSensor {
     private static PRESENCE_DETECTION;
     private static CURRENT_ILLUMINATION;
     excludeFromNightAlarm: boolean;
-    presenceDetected: boolean;
+    movementDetected: boolean;
     battery: number;
-    private _presenceDetectedCallback;
+    settings: MotionSensorSettings;
+    private _movementDetectedCallback;
     private initialized;
+    private _lastMotionTime;
     constructor(pInfo: IoBrokerDeviceInfo);
+    get timeSinceLastMotion(): number;
     private _detectionsToday;
     get detectionsToday(): number;
     set detectionsToday(pVal: number);
     private _currentIllumination;
     get currentIllumination(): number;
     private set currentIllumination(value);
-    addPresenceCallback(pCallback: (pValue: boolean) => void): void;
+    addMovementCallback(pCallback: (pValue: boolean) => void): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     updatePresence(pVal: boolean): void;
+    persist(): void;
 }

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

@@ -11,22 +11,25 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
         var _a;
         super(pInfo, deviceType_1.DeviceType.HmIpPraezenz);
         this.excludeFromNightAlarm = false;
-        this.presenceDetected = false;
+        this.movementDetected = false;
         this.battery = -99;
-        this._presenceDetectedCallback = [];
+        this.settings = new models_1.MotionSensorSettings();
+        this._movementDetectedCallback = [];
         // private presenceStateID: string;
         this.initialized = false;
+        this._lastMotionTime = 0;
         this._detectionsToday = 0;
         this._currentIllumination = -1;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.illuminationSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.motionSensor);
         // this.presenceStateID = `${this.info.fullID}.1.${HmIpPraezenz.PRESENCE_DETECTION}`;
         if (!services_1.Utils.anyDboActive) {
             this.initialized = true;
         }
         else {
-            (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.getCount(this).then((todayCount) => {
-                this.detectionsToday = todayCount.counter;
+            (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.motionSensorTodayCount(this).then((todayCount) => {
+                this.detectionsToday = todayCount.count;
                 this.log(models_1.LogLevel.Debug, `Präsenzcounter vorinitialisiert mit ${this.detectionsToday}`);
                 this.initialized = true;
             }).catch((err) => {
@@ -35,14 +38,14 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
             });
         }
     }
+    get timeSinceLastMotion() {
+        return Math.floor((services_1.Utils.nowMS() - this._lastMotionTime) / 1000);
+    }
     get detectionsToday() {
         return this._detectionsToday;
     }
     set detectionsToday(pVal) {
-        var _a;
-        const oldVal = this._detectionsToday;
         this._detectionsToday = pVal;
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistTodayCount(this, pVal, oldVal);
     }
     get currentIllumination() {
         return this._currentIllumination;
@@ -52,8 +55,8 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
         this._currentIllumination = value;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistCurrentIllumination(new models_1.CurrentIlluminationDataPoint(this.info.room, this.info.devID, value, new Date(), (_d = (_c = (_b = this.room) === null || _b === void 0 ? void 0 : _b.LampenGroup) === null || _c === void 0 ? void 0 : _c.anyLightsOn()) !== null && _d !== void 0 ? _d : false));
     }
-    addPresenceCallback(pCallback) {
-        this._presenceDetectedCallback.push(pCallback);
+    addMovementCallback(pCallback) {
+        this._movementDetectedCallback.push(pCallback);
     }
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Präzens Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
@@ -86,20 +89,26 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
             }, 1000, this);
             return;
         }
-        if (pVal === this.presenceDetected) {
+        if (pVal === this.movementDetected) {
             this.log(models_1.LogLevel.Debug, `Überspringe Präsenz da bereits der Wert ${pVal} vorliegt`);
             return;
         }
-        this.presenceDetected = pVal;
+        this.movementDetected = pVal;
+        this.persist();
         this.log(models_1.LogLevel.Debug, `Neuer Präsenzstatus Wert : ${pVal}`);
         if (pVal) {
             this.detectionsToday++;
+            this._lastMotionTime = services_1.Utils.nowMS();
             this.log(models_1.LogLevel.Trace, `Dies ist die ${this.detectionsToday} Bewegung `);
         }
-        for (const c of this._presenceDetectedCallback) {
+        for (const c of this._movementDetectedCallback) {
             c(pVal);
         }
     }
+    persist() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistMotionSensor(this);
+    }
 }
 exports.HmIpPraezenz = HmIpPraezenz;
 // TODO: Add iPresenceSensor

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

@@ -24,7 +24,9 @@ class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case 'state':
-                !handledByChildObject && this.log(models_1.LogLevel.Trace, `Aktor Update für ${this.info.customName} auf ${state.val}`);
+                if (!handledByChildObject) {
+                    this.log(models_1.LogLevel.Trace, `Aktor Update für ${this.info.customName} auf ${state.val}`);
+                }
                 this.actuatorOn = state.val;
                 break;
         }

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

@@ -23,9 +23,9 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
             this._initialized = true;
         }
         else {
-            (_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}`);
+            (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.motionSensorTodayCount(this).then((todayCount) => {
+                this.detectionsToday = todayCount.count;
+                this.log(models_1.LogLevel.Debug, `Reinitialized movement counter with ${this.detectionsToday}`);
                 this._initialized = true;
             }).catch((err) => {
                 var _a;
@@ -41,10 +41,7 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
         return this._detectionsToday;
     }
     set detectionsToday(pVal) {
-        var _a;
-        const oldVal = this._detectionsToday;
         this._detectionsToday = pVal;
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistTodayCount(this, pVal, oldVal);
     }
     /**
      * Adds a callback for when a motion state has changed.

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

@@ -26,5 +26,6 @@ export declare class ZigbeeIlluDimmer extends ZigbeeDevice implements iDimmableL
      * @param {number} transitionTime The transition time for the brightness, to switch smoothly
      */
     setLight(pValue: boolean, timeout?: number, force?: boolean, brightness?: number, transitionTime?: number): void;
+    persist(): void;
     toggleLight(time?: TimeOfDay, force?: boolean, calculateTime?: boolean): boolean;
 }

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

@@ -33,10 +33,12 @@ class ZigbeeIlluDimmer extends BaseDevices_1.ZigbeeDevice {
             case 'state':
                 this.log(models_1.LogLevel.Trace, `Dimmer Update für ${this.info.customName} auf ${state.val}`);
                 this.lightOn = state.val;
+                this.persist();
                 break;
             case 'brightness':
                 this.log(models_1.LogLevel.Trace, `Dimmer Helligkeit Update für ${this.info.customName} auf ${state.val}`);
                 this.brightness = state.val;
+                this.persist();
                 break;
             case 'transition_time':
                 this.log(models_1.LogLevel.Trace, `Dimmer Transition Time Update für ${this.info.customName} auf ${state.val}`);
@@ -126,6 +128,10 @@ class ZigbeeIlluDimmer extends BaseDevices_1.ZigbeeDevice {
             }
         }, timeout, this);
     }
+    persist() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistLamp(this);
+    }
     toggleLight(time, force = false, calculateTime = false) {
         var _a;
         const newVal = this.queuedValue !== null ? !this.queuedValue : !this.lightOn;

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

@@ -11,4 +11,5 @@ export declare class ZigbeeIlluLampe extends ZigbeeIlluActuator implements iLamp
     setLight(pValue: boolean, timeout?: number, force?: boolean): void;
     toggleLight(time?: TimeOfDay, force?: boolean, calculateTime?: boolean): boolean;
     setTimeBased(time: TimeOfDay, timeout?: number, force?: boolean): void;
+    persist(): void;
 }

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

@@ -12,13 +12,14 @@ class ZigbeeIlluLampe extends zigbeeIlluActuator_1.ZigbeeIlluActuator {
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
     }
     get lightOn() {
-        return super.actuatorOn;
+        return super.isActuatorOn;
     }
     update(idSplit, state, initial = false) {
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case 'state':
                 this.log(models_1.LogLevel.Trace, `Lampen Update für ${this.info.customName} auf ${state.val}`);
+                this.persist();
                 break;
         }
     }
@@ -57,5 +58,9 @@ class ZigbeeIlluLampe extends zigbeeIlluActuator_1.ZigbeeIlluActuator {
             this.setLight(true, timeout, force);
         }
     }
+    persist() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistLamp(this);
+    }
 }
 exports.ZigbeeIlluLampe = ZigbeeIlluLampe;

package/lib/server/services/dbo/iPersist.d.ts

@@ -1,17 +1,17 @@
-import { iAcDevice, iHeater, iMotionSensor, IoBrokerBaseDevice } from '../../devices';
+import { iAcDevice, iHeater, iLamp, iMotionSensor, IoBrokerBaseDevice } from '../../devices';
 import { CountToday, CurrentIlluminationDataPoint, EnergyCalculation, RoomBase, ShutterCalibration, TemperaturDataPoint } from '../../../models';
 export interface iPersist {
     initialized: boolean;
     addTemperaturDataPoint(heater: iHeater): void;
     addRoom(room: RoomBase): void;
-    getCount(device: IoBrokerBaseDevice): Promise<CountToday>;
+    motionSensorTodayCount(device: iMotionSensor): Promise<CountToday>;
     getShutterCalibration(device: IoBrokerBaseDevice): Promise<ShutterCalibration>;
     initialize(): Promise<void>;
-    persistTodayCount(device: IoBrokerBaseDevice, count: number, oldCount: number): void;
     persistShutterCalibration(data: ShutterCalibration): void;
     persistCurrentIllumination(data: CurrentIlluminationDataPoint): void;
     persistEnergyManager(energyData: EnergyCalculation): void;
     persistAC(device: iAcDevice): void;
+    persistLamp(device: iLamp): void;
     persistMotionSensor(device: iMotionSensor): void;
     readTemperaturDataPoint(hzGrp: iHeater, limit: number): Promise<TemperaturDataPoint[]>;
 }

package/lib/server/services/dbo/index.d.ts

@@ -1,3 +1,2 @@
-export * from './mongoPersistance';
 export * from './postgreSqlPersist';
 export * from './iPersist';

package/lib/server/services/dbo/index.js

@@ -14,6 +14,5 @@ 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 });
-__exportStar(require("./mongoPersistance"), exports);
 __exportStar(require("./postgreSqlPersist"), exports);
 __exportStar(require("./iPersist"), exports);

package/lib/server/services/dbo/postgreSqlPersist.d.ts

@@ -1,6 +1,6 @@
 import { iPersist } from './iPersist';
 import { CountToday, CurrentIlluminationDataPoint, EnergyCalculation, RoomBase, ShutterCalibration, TemperaturDataPoint } from '../../../models';
-import { iAcDevice, iHeater, iMotionSensor, IoBrokerBaseDevice } from '../../devices';
+import { iAcDevice, iHeater, iLamp, iMotionSensor, IoBrokerBaseDevice } from '../../devices';
 import { iPersistenceSettings } from '../../config';
 export declare class PostgreSqlPersist implements iPersist {
     initialized: boolean;
@@ -8,14 +8,14 @@ export declare class PostgreSqlPersist implements iPersist {
     constructor(config: iPersistenceSettings);
     addRoom(room: RoomBase): void;
     addTemperaturDataPoint(heater: iHeater): void;
-    getCount(device: IoBrokerBaseDevice): Promise<CountToday>;
+    motionSensorTodayCount(device: iMotionSensor): Promise<CountToday>;
     getShutterCalibration(_device: IoBrokerBaseDevice): Promise<ShutterCalibration>;
     initialize(): Promise<void>;
     persistAC(device: iAcDevice): void;
+    persistLamp(device: iLamp): void;
     persistMotionSensor(device: iMotionSensor): void;
     persistCurrentIllumination(data: CurrentIlluminationDataPoint): void;
     persistShutterCalibration(_data: ShutterCalibration): void;
-    persistTodayCount(device: IoBrokerBaseDevice, count: number, oldCount: number): void;
     readTemperaturDataPoint(heater: iHeater, limit: number): Promise<TemperaturDataPoint[]>;
     persistEnergyManager(calc: EnergyCalculation): void;
     private query;