hoffmation-base 0.1.31-8 → 0.1.33-2

package/lib/models/rooms/RoomBase.d.ts

@@ -41,4 +41,5 @@ export declare class RoomBase implements iRoomBase {
      */
     setLightTimeBased(movementDependant?: boolean): void;
     isNowLightTime(): boolean;
+    toJSON(): Partial<RoomBase>;
 }

package/lib/models/rooms/RoomBase.js

@@ -9,6 +9,7 @@ const room_service_1 = require("../../server/services/room-service/room-service"
 const roomInfo_1 = require("./roomInfo");
 const group_type_1 = require("../../server/devices/groups/group-type");
 const ShutterService_1 = require("../../server/services/ShutterService");
+const utils_1 = require("../../server/services/utils/utils");
 class RoomBase {
     constructor(roomName, Einstellungen, groups) {
         this.Einstellungen = Einstellungen;
@@ -119,5 +120,9 @@ class RoomBase {
         }
         return time_callback_service_1.TimeCallbackService.darkOutsideOrNight(timeOfDay);
     }
+    toJSON() {
+        const result = utils_1.Utils.jsonFilter(this);
+        return result;
+    }
 }
 exports.RoomBase = RoomBase;

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

@@ -15,4 +15,5 @@ export declare class DeviceInfo {
     constructor(pDevConf: deviceConfig);
     set customName(val: string);
     get customName(): string;
+    toJSON(): Partial<DeviceInfo>;
 }

package/lib/server/devices/DeviceInfo.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceInfo = void 0;
+const lodash_1 = __importDefault(require("lodash"));
 class DeviceInfo {
     constructor(pDevConf) {
         this.devConf = pDevConf;
@@ -44,5 +48,8 @@ class DeviceInfo {
         }
         return this.fullName;
     }
+    toJSON() {
+        return lodash_1.default.omit(this, ['devConf']);
+    }
 }
 exports.DeviceInfo = DeviceInfo;

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

@@ -46,4 +46,5 @@ export declare abstract class IoBrokerBaseDevice {
      * @param onError Callback to run if an error has occurred during writing the data
      */
     protected setState(pointId: string, state: string | number | boolean | ioBroker.State | ioBroker.SettableState | null, onSuccess?: (() => void) | undefined, onError?: ((error: Error) => void) | undefined): void;
+    toJSON(): Partial<IoBrokerBaseDevice>;
 }

package/lib/server/devices/IoBrokerBaseDevice.js

@@ -115,6 +115,10 @@ class IoBrokerBaseDevice {
             }
         });
     }
+    toJSON() {
+        const result = utils_1.Utils.jsonFilter(this);
+        return result;
+    }
 }
 exports.IoBrokerBaseDevice = IoBrokerBaseDevice;
 IoBrokerBaseDevice.roomAddingSettings = {};

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

@@ -23,6 +23,7 @@ export declare enum DeviceType {
     ZigbeeIlluActuator = 210,
     ZigbeeAquaraMotion = 211,
     ZigbeeIlluShutter = 212,
-    ZigbeeSMaBiTMagnetContact = 212,
+    ZigbeeSMaBiTMagnetContact = 213,
+    ZigbeeSonoffMotion = 214,
     Wled = 1001
 }

package/lib/server/devices/deviceType.js

@@ -27,6 +27,7 @@ var DeviceType;
     DeviceType[DeviceType["ZigbeeIlluActuator"] = 210] = "ZigbeeIlluActuator";
     DeviceType[DeviceType["ZigbeeAquaraMotion"] = 211] = "ZigbeeAquaraMotion";
     DeviceType[DeviceType["ZigbeeIlluShutter"] = 212] = "ZigbeeIlluShutter";
-    DeviceType[DeviceType["ZigbeeSMaBiTMagnetContact"] = 212] = "ZigbeeSMaBiTMagnetContact";
+    DeviceType[DeviceType["ZigbeeSMaBiTMagnetContact"] = 213] = "ZigbeeSMaBiTMagnetContact";
+    DeviceType[DeviceType["ZigbeeSonoffMotion"] = 214] = "ZigbeeSonoffMotion";
     DeviceType[DeviceType["Wled"] = 1001] = "Wled";
 })(DeviceType = exports.DeviceType || (exports.DeviceType = {}));

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

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

package/lib/server/devices/devices.js

@@ -30,10 +30,11 @@ const hmIpTuer_1 = require("./hmIPDevices/hmIpTuer");
 const hmIpHeizgruppe_1 = require("./hmIPDevices/hmIpHeizgruppe");
 const zigbeeIlluShutter_1 = require("./zigbee/zigbeeIlluShutter");
 const zigbeeSMaBiTMagnetContact_1 = require("./zigbee/zigbeeSMaBiTMagnetContact");
+const zigbeeSonoffMotion_1 = require("./zigbee/zigbeeSonoffMotion");
 class Devices {
     constructor(pDeviceData, pRoomImportEnforcer) {
         // This forces import of rooms at correct timing, to allow devices to land in proper rooms.
-        pRoomImportEnforcer.addRoomConstructor();
+        pRoomImportEnforcer === null || pRoomImportEnforcer === void 0 ? void 0 : pRoomImportEnforcer.addRoomConstructor();
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Constructing devices now`);
         for (const cID in pDeviceData) {
             const cDevConf = pDeviceData[cID];
@@ -118,6 +119,9 @@ class Devices {
             case 'SMaBiTMagnet':
                 d = new zigbeeSMaBiTMagnetContact_1.ZigbeeSMaBiTMagnetContact(zigbeeInfo);
                 break;
+            case 'SonoffMotion':
+                d = new zigbeeSonoffMotion_1.ZigbeeSonoffMotion(zigbeeInfo);
+                break;
             default:
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `No zigbee Device Type for ${zigbeeInfo.deviceType} defined`);
                 d = new zigbeeDevice_1.ZigbeeDevice(zigbeeInfo, deviceType_1.DeviceType.unknown);

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

@@ -1,10 +1,10 @@
 import { HmIpPraezenz } from '../hmIPDevices/hmIpPraezenz';
-import { ZigbeeAquaraMotion } from '../zigbee/zigbeeAquaraMotion';
 import { HmIpBewegung } from '../hmIPDevices/hmIpBewegung';
 import { BaseGroup } from './base-group';
+import { ZigbeeMotionSensor } from '../zigbee/zigbeeMotionSensor';
 export declare class PraesenzGroup extends BaseGroup {
     private _lastMovement;
-    getMotionDetector(): Array<HmIpBewegung | ZigbeeAquaraMotion>;
+    getMotionDetector(): Array<HmIpBewegung | ZigbeeMotionSensor>;
     getPresenceSensors(): HmIpPraezenz[];
     constructor(roomName: string, presenceDetectorIds: string[], motionSensorIds: string[]);
     initCallbacks(): void;

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

@@ -10,7 +10,7 @@ export declare class HmIpBewegung extends HmIPDevice implements iIlluminationSen
     private static MOVEMENT_DETECTION;
     private static CURRENT_ILLUMINATION;
     private initialized;
-    private fallBackTimeout;
+    private _fallBackTimeout;
     private _currentIllumination;
     get currentIllumination(): number;
     private set currentIllumination(value);

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

@@ -91,15 +91,15 @@ class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
         }
     }
     resetFallbackTimeout() {
-        if (this.fallBackTimeout) {
+        if (this._fallBackTimeout) {
             log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Fallback Timeout für "${this.info.customName}" zurücksetzen`);
-            clearTimeout(this.fallBackTimeout);
+            clearTimeout(this._fallBackTimeout);
         }
     }
     startFallbackTimeout() {
-        this.fallBackTimeout = utils_1.Utils.guardedTimeout(() => {
+        this._fallBackTimeout = utils_1.Utils.guardedTimeout(() => {
             log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Benötige Fallback Bewegungs Reset für "${this.info.customName}"`);
-            this.fallBackTimeout = undefined;
+            this._fallBackTimeout = undefined;
             this.updateMovement(false);
         }, 270000, this);
     }

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

@@ -8,7 +8,7 @@ export declare class HmIpGriff extends HmIPDevice {
     private _kippCallback;
     private _closedCallback;
     private _offenCallback;
-    private _iOpen;
+    private _iOpenTimeout;
     private minutesOpen;
     private _fenster;
     private _helpingRoomTemp;
@@ -19,4 +19,5 @@ export declare class HmIpGriff extends HmIPDevice {
     set Fenster(value: Fenster);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     updatePosition(pValue: FensterPosition): void;
+    toJSON(): Partial<HmIpGriff>;
 }

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

@@ -1,4 +1,7 @@
 "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 hmIpDevice_1 = require("./hmIpDevice");
@@ -9,6 +12,7 @@ const weather_service_1 = require("../../services/weather/weather-service");
 const telegram_service_1 = require("../../services/Telegram/telegram-service");
 const FensterPosition_1 = require("../models/FensterPosition");
 const logLevel_1 = require("../../../models/logLevel");
+const lodash_1 = __importDefault(require("lodash"));
 class HmIpGriff extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpGriff);
@@ -59,16 +63,16 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
             c3(pValue === 2);
         }
         if (pValue === FensterPosition_1.FensterPosition.geschlossen) {
-            if (this._iOpen !== undefined) {
-                clearInterval(this._iOpen);
+            if (this._iOpenTimeout !== undefined) {
+                clearInterval(this._iOpenTimeout);
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Fenster: "${this.info.customName}" nach ${this.minutesOpen} Minuten geschlossen`);
                 this.minutesOpen = 0;
-                this._iOpen = undefined;
+                this._iOpenTimeout = undefined;
             }
             return;
         }
-        else if (this._iOpen === undefined) {
-            this._iOpen = utils_1.Utils.guardedInterval(() => {
+        else if (this._iOpenTimeout === undefined) {
+            this._iOpenTimeout = utils_1.Utils.guardedInterval(() => {
                 var _a;
                 this.minutesOpen++;
                 const heatgroup = (_a = this._fenster) === null || _a === void 0 ? void 0 : _a.getRoom().HeatGroup;
@@ -115,5 +119,8 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
             }, 60000, this);
         }
     }
+    toJSON() {
+        return lodash_1.default.omit(this, ['_fenster']);
+    }
 }
 exports.HmIpGriff = HmIpGriff;

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

@@ -10,7 +10,7 @@ export declare class HmIpLampe extends HmIPDevice implements iLamp {
     isStromStoss: boolean;
     settings: ActuatorSettings;
     private lightOnSwitchID;
-    private turnOffTimeout;
+    private _turnOffTimeout;
     private turnOffTime;
     constructor(pInfo: DeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;

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

@@ -16,7 +16,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
         this.isStromStoss = false;
         this.settings = new actuatorSettings_1.ActuatorSettings();
         this.lightOnSwitchID = '';
-        this.turnOffTimeout = undefined;
+        this._turnOffTimeout = undefined;
         this.turnOffTime = 0;
         this.lightOnSwitchID = `${this.info.fullID}.2.STATE`;
     }
@@ -58,17 +58,17 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
         if (this.isStromStoss) {
             timeout = 5000;
         }
-        if (this.turnOffTimeout !== undefined) {
-            clearTimeout(this.turnOffTimeout);
-            this.turnOffTimeout = undefined;
+        if (this._turnOffTimeout !== undefined) {
+            clearTimeout(this._turnOffTimeout);
+            this._turnOffTimeout = undefined;
         }
         if (timeout < 0 || !pValue) {
             return;
         }
         this.turnOffTime = utils_1.Utils.nowMS() + timeout;
-        this.turnOffTimeout = utils_1.Utils.guardedTimeout(() => {
+        this._turnOffTimeout = utils_1.Utils.guardedTimeout(() => {
             log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Delayed Turnoff for "${this.info.customName}" initiated`);
-            this.turnOffTimeout = undefined;
+            this._turnOffTimeout = undefined;
             if (!this.room) {
                 this.setLight(false, -1, true);
             }

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

@@ -18,4 +18,5 @@ export declare class HmIpRoll extends HmIPDevice implements iShutter {
     constructor(pInfo: DeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     setLevel(pPosition: number, initial?: boolean, skipOpenWarning?: boolean): void;
+    toJSON(): Partial<HmIpRoll>;
 }

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

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpRoll = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
@@ -7,6 +10,7 @@ const utils_1 = require("../../services/utils/utils");
 const log_service_1 = require("../../services/log-service");
 const FensterPosition_1 = require("../models/FensterPosition");
 const logLevel_1 = require("../../../models/logLevel");
+const lodash_1 = __importDefault(require("lodash"));
 class HmIpRoll extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpRoll);
@@ -94,5 +98,8 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Fahre Rollo "${this.info.customName}" auf Position ${pPosition}`);
         this.setState(this._setLevelSwitchID, pPosition);
     }
+    toJSON() {
+        return lodash_1.default.omit(this, ['_fenster']);
+    }
 }
 exports.HmIpRoll = HmIpRoll;

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

@@ -6,7 +6,7 @@ export declare class HmIpTuer extends HmIPDevice {
     position: MagnetPosition;
     private _closedCallback;
     private _openCallback;
-    private _iOpen;
+    private _iOpenTimeout;
     private minutesOpen;
     constructor(pInfo: DeviceInfo);
     addOpenCallback(pCallback: (pValue: boolean) => void): void;

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

@@ -52,8 +52,8 @@ class HmIpTuer extends hmIpDevice_1.HmIPDevice {
             c2(pValue === 1);
         }
         if (pValue === MagnetPosition_1.MagnetPosition.closed) {
-            if (this._iOpen !== undefined) {
-                clearInterval(this._iOpen);
+            if (this._iOpenTimeout !== undefined) {
+                clearInterval(this._iOpenTimeout);
                 let message = `${this.info.customName} closed after ${this.minutesOpen} minutes!`;
                 if (this.minutesOpen === 0) {
                     message = `"${this.info.customName}" just closed`;
@@ -62,16 +62,16 @@ class HmIpTuer extends hmIpDevice_1.HmIPDevice {
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, message);
                 telegram_service_1.TelegramService.inform(message);
                 this.minutesOpen = 0;
-                this._iOpen = undefined;
+                this._iOpenTimeout = undefined;
             }
             return;
         }
-        else if (this._iOpen === undefined) {
+        else if (this._iOpenTimeout === undefined) {
             const message = res_1.Res.wasOpened(this.info.customName);
             //const message: string = `Die Tür mit dem Namen "${this.info.customName}" wurde geöfnet!`
             telegram_service_1.TelegramService.inform(message);
             sonos_service_1.SonosService.speakOnAll(message, 40);
-            this._iOpen = utils_1.Utils.guardedInterval(() => {
+            this._iOpenTimeout = utils_1.Utils.guardedInterval(() => {
                 this.minutesOpen++;
                 const message = `Contact: "${this.info.customName}" is  ${MagnetPosition_1.MagnetPosition[this.position]} since ${this.minutesOpen} minutes`;
                 switch (this.minutesOpen) {

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

@@ -8,7 +8,7 @@ export declare class ZigbeeActuator extends ZigbeeDevice {
     protected readonly actuatorOnSwitchID: string;
     protected queuedValue: boolean | null;
     protected actuatorOn: boolean;
-    private turnOffTimeout;
+    private _turnOffTimeout;
     private turnOffTime;
     constructor(pInfo: DeviceInfo, type: DeviceType, actuatorOnSwitchID: string);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, handledByChildObject?: boolean): void;

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

@@ -12,7 +12,7 @@ class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
         this.settings = new actuatorSettings_1.ActuatorSettings();
         this.queuedValue = null;
         this.actuatorOn = false;
-        this.turnOffTimeout = undefined;
+        this._turnOffTimeout = undefined;
         this.turnOffTime = 0;
         this.actuatorOnSwitchID = actuatorOnSwitchID;
     }
@@ -48,17 +48,17 @@ class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
             console.log(`Stecker schalten ergab Fehler: ${err}`);
         });
         this.queuedValue = pValue;
-        if (this.turnOffTimeout !== undefined) {
-            clearTimeout(this.turnOffTimeout);
-            this.turnOffTimeout = undefined;
+        if (this._turnOffTimeout !== undefined) {
+            clearTimeout(this._turnOffTimeout);
+            this._turnOffTimeout = undefined;
         }
         if (timeout < 0 || !pValue) {
             return;
         }
         this.turnOffTime = utils_1.Utils.nowMS() + timeout;
-        this.turnOffTimeout = utils_1.Utils.guardedTimeout(() => {
+        this._turnOffTimeout = utils_1.Utils.guardedTimeout(() => {
             log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Delayed Turnoff for "${this.info.customName}" initiated`);
-            this.turnOffTimeout = undefined;
+            this._turnOffTimeout = undefined;
             if (!this.room) {
                 this.setActuator(false, -1, true);
             }

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

@@ -1,35 +1,15 @@
 /// <reference types="iobroker" />
-import { RoomBase } from '../../../models/rooms/RoomBase';
 import { DeviceInfo } from '../DeviceInfo';
-import { ZigbeeDevice } from './zigbeeDevice';
 import { iIlluminationSensor } from '../iIlluminationSensor';
-export declare class ZigbeeAquaraMotion extends ZigbeeDevice implements iIlluminationSensor {
-    movementDetected: boolean;
-    excludeFromNightAlarm: boolean;
-    room: RoomBase | undefined;
-    private _timeSinceLastMotion;
+import { ZigbeeMotionSensor } from './zigbeeMotionSensor';
+export declare class ZigbeeAquaraMotion extends ZigbeeMotionSensor implements iIlluminationSensor {
     private _illuminance;
     private _motionTimeout;
-    private _detectionsToday;
-    private _initialized;
-    private _movementDetectedCallback;
-    private _fallBackTimeout;
     private occupancyTimeoutID;
     get currentIllumination(): number;
     private set currentIllumination(value);
-    get timeSinceLastMotion(): number;
     get motionTimeout(): number;
     set motionTimeout(value: number);
-    get detectionsToday(): number;
-    set detectionsToday(pVal: number);
     constructor(pInfo: DeviceInfo);
-    /**
-     * Adds a callback for when a motion state has changed.
-     * @param pCallback Function that accepts the new state as parameter
-     */
-    addMovementCallback(pCallback: (newState: boolean) => void): void;
-    updateMovement(newState: boolean): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
-    private resetFallbackTimeout;
-    private startFallbackTimeout;
 }

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

@@ -3,34 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeAquaraMotion = void 0;
 const deviceType_1 = require("../deviceType");
 const log_service_1 = require("../../services/log-service");
-const utils_1 = require("../../services/utils/utils");
-const zigbeeDevice_1 = require("./zigbeeDevice");
 const persist_1 = require("../../services/dbo/persist");
 const CurrentIlluminationDataPoint_1 = require("../../../models/persistence/CurrentIlluminationDataPoint");
 const logLevel_1 = require("../../../models/logLevel");
-class ZigbeeAquaraMotion extends zigbeeDevice_1.ZigbeeDevice {
+const zigbeeMotionSensor_1 = require("./zigbeeMotionSensor");
+class ZigbeeAquaraMotion extends zigbeeMotionSensor_1.ZigbeeMotionSensor {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraMotion);
-        this.movementDetected = false;
-        this.excludeFromNightAlarm = false;
-        this.room = undefined;
-        this._timeSinceLastMotion = 0;
         this._illuminance = 0;
         this._motionTimeout = 0;
-        this._detectionsToday = 0;
-        this._initialized = false;
-        this._movementDetectedCallback = [];
         this.occupancyTimeoutID = `occupancy_timeout`;
         this.occupancyTimeoutID = `${this.info.fullID}.${this.occupancyTimeoutID}`;
-        persist_1.Persist.getCount(this)
-            .then((todayCount) => {
-            this.detectionsToday = todayCount.counter;
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Preinitialized movement counter for "${this.info.customName}" with ${this.detectionsToday}`);
-            this._initialized = true;
-        })
-            .catch((err) => {
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `Failed to initialize movement counter for "${this.info.customName}", err ${err.message}`);
-        });
     }
     // Currently measured brightness in lux
     get currentIllumination() {
@@ -41,10 +24,6 @@ class ZigbeeAquaraMotion extends zigbeeDevice_1.ZigbeeDevice {
         this._illuminance = value;
         persist_1.Persist.persistCurrentIllumination(new CurrentIlluminationDataPoint_1.CurrentIlluminationDataPoint(this.info.room, this.info.devID, value, new Date(), (_c = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.LampenGroup) === null || _b === void 0 ? void 0 : _b.anyLightsOwn()) !== null && _c !== void 0 ? _c : false));
     }
-    // Time since last motion in seconds
-    get timeSinceLastMotion() {
-        return this._timeSinceLastMotion;
-    }
     // Time after the last trigger until a motion event gets triggered again
     get motionTimeout() {
         return this._motionTimeout;
@@ -56,62 +35,10 @@ class ZigbeeAquaraMotion extends zigbeeDevice_1.ZigbeeDevice {
             console.log(`Error occurred while setting motion timeout: ${err}`);
         });
     }
-    get detectionsToday() {
-        return this._detectionsToday;
-    }
-    set detectionsToday(pVal) {
-        const oldVal = this._detectionsToday;
-        this._detectionsToday = pVal;
-        persist_1.Persist.persistTodayCount(this, pVal, oldVal);
-    }
-    /**
-     * Adds a callback for when a motion state has changed.
-     * @param pCallback Function that accepts the new state as parameter
-     */
-    addMovementCallback(pCallback) {
-        this._movementDetectedCallback.push(pCallback);
-    }
-    updateMovement(newState) {
-        if (!this._initialized && newState) {
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Movement recognized for "${this.info.customName}", but database initialization has not finished yet --> delay.`);
-            utils_1.Utils.guardedTimeout(() => {
-                this.updateMovement(newState);
-            }, 1000, this);
-            return;
-        }
-        if (newState === this.movementDetected) {
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Skip movement for "${this.info.customName}" because state is already ${newState}`);
-            if (newState) {
-                // Wenn ein Sensor sich nicht von alleine zurücksetzt, hier erzwingen.
-                this.resetFallbackTimeout();
-                this.startFallbackTimeout();
-            }
-            return;
-        }
-        this.resetFallbackTimeout();
-        this.movementDetected = newState;
-        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `New movement state for "${this.info.customName}": ${newState}`);
-        if (newState) {
-            this.startFallbackTimeout();
-            this.detectionsToday++;
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `This is movement no. ${this.detectionsToday} for "${this.info.customName}"`);
-        }
-        for (const c of this._movementDetectedCallback) {
-            c(newState);
-        }
-    }
     update(idSplit, state, initial = false) {
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.DeepTrace, `Motion update for "${this.info.customName}": ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
-            case 'occupancy':
-                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Motion sensor: Update for motion state of ${this.info.customName}: ${state.val}`);
-                this.updateMovement(state.val);
-                break;
-            case 'no_motion':
-                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Motion sensor: Update for time since last motion of ${this.info.customName}: ${state.val}`);
-                this._timeSinceLastMotion = state.val;
-                break;
             case 'illuminance':
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Motion sensor: Update for illuminance of ${this.info.customName}: ${state.val}`);
                 this.currentIllumination = state.val;
@@ -122,18 +49,5 @@ class ZigbeeAquaraMotion extends zigbeeDevice_1.ZigbeeDevice {
                 break;
         }
     }
-    resetFallbackTimeout() {
-        if (this._fallBackTimeout) {
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Fallback Timeout für "${this.info.customName}" zurücksetzen`);
-            clearTimeout(this._fallBackTimeout);
-        }
-    }
-    startFallbackTimeout() {
-        this._fallBackTimeout = utils_1.Utils.guardedTimeout(() => {
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Benötige Fallback Bewegungs Reset für "${this.info.customName}"`);
-            this._fallBackTimeout = undefined;
-            this.updateMovement(false);
-        }, 270000, this);
-    }
 }
 exports.ZigbeeAquaraMotion = ZigbeeAquaraMotion;

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

@@ -5,7 +5,7 @@ import { ZigbeeDevice } from './zigbeeDevice';
 export declare class ZigbeeAquaraWater extends ZigbeeDevice {
     water: boolean;
     private _roomName;
-    iAlarm: NodeJS.Timeout | undefined;
+    iAlarmTimeout: NodeJS.Timeout | undefined;
     private _messageAlarmFirst;
     private _messageAlarm;
     private _messageAlarmEnd;

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

@@ -14,7 +14,7 @@ class ZigbeeAquaraWater extends zigbeeDevice_1.ZigbeeDevice {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraWater);
         this.water = false;
         this._roomName = '';
-        this.iAlarm = undefined;
+        this.iAlarmTimeout = undefined;
         this._messageAlarmFirst = '';
         this._messageAlarm = '';
         this._messageAlarmEnd = '';
@@ -49,17 +49,17 @@ class ZigbeeAquaraWater extends zigbeeDevice_1.ZigbeeDevice {
         }
     }
     startAlarm() {
-        if (this.iAlarm !== undefined) {
-            clearInterval(this.iAlarm);
+        if (this.iAlarmTimeout !== undefined) {
+            clearInterval(this.iAlarmTimeout);
         }
-        this.iAlarm = utils_1.Utils.guardedInterval(() => {
+        this.iAlarmTimeout = utils_1.Utils.guardedInterval(() => {
             this.alarm();
         }, 15000, this);
         this.alarm(true);
     }
     stopAlarm(quiet = false) {
-        if (this.iAlarm) {
-            clearInterval(this.iAlarm);
+        if (this.iAlarmTimeout) {
+            clearInterval(this.iAlarmTimeout);
         }
         if (quiet) {
             return;

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

@@ -5,7 +5,7 @@ import { ZigbeeDevice } from './zigbeeDevice';
 export declare class ZigbeeHeimanSmoke extends ZigbeeDevice {
     smoke: boolean;
     private _roomName;
-    iAlarm: NodeJS.Timeout | undefined;
+    iAlarmTimeout: NodeJS.Timeout | undefined;
     private _messageAlarmFirst;
     private _messageAlarm;
     private _messageAlarmEnd;

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

@@ -15,7 +15,7 @@ class ZigbeeHeimanSmoke extends zigbeeDevice_1.ZigbeeDevice {
         super(pInfo, deviceType_1.DeviceType.ZigbeeHeimanSmoke);
         this.smoke = false;
         this._roomName = '';
-        this.iAlarm = undefined;
+        this.iAlarmTimeout = undefined;
         this._messageAlarmFirst = '';
         this._messageAlarm = '';
         this._messageAlarmEnd = '';
@@ -50,17 +50,17 @@ class ZigbeeHeimanSmoke extends zigbeeDevice_1.ZigbeeDevice {
         }
     }
     startAlarm() {
-        if (this.iAlarm !== undefined) {
-            clearInterval(this.iAlarm);
+        if (this.iAlarmTimeout !== undefined) {
+            clearInterval(this.iAlarmTimeout);
         }
-        this.iAlarm = utils_1.Utils.guardedInterval(() => {
+        this.iAlarmTimeout = utils_1.Utils.guardedInterval(() => {
             this.alarm();
         }, 15000, this);
         this.alarm(true);
     }
     stopAlarm(quiet = false) {
-        if (this.iAlarm) {
-            clearInterval(this.iAlarm);
+        if (this.iAlarmTimeout) {
+            clearInterval(this.iAlarmTimeout);
         }
         if (quiet) {
             return;