hoffmation-base 0.1.41-1 → 0.1.41-13

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

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Fenster = void 0;
-const utils_1 = require("../../services/utils/utils");
-const FensterPosition_1 = require("../models/FensterPosition");
-const time_callback_service_1 = require("../../services/time-callback-service");
-const logLevel_1 = require("../../../models/logLevel");
-const ShutterService_1 = require("../../services/ShutterService");
+const services_1 = require("../../services");
+const models_1 = require("../models");
+const models_2 = require("../../../models");
 const base_group_1 = require("./base-group");
 const group_type_1 = require("./group-type");
 const device_cluster_type_1 = require("../device-cluster-type");
@@ -35,10 +33,10 @@ class Fenster extends base_group_1.BaseGroup {
         return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.MagnetContact);
     }
     getShutter() {
-        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.Shutter);
+        return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Shutter);
     }
     getVibration() {
-        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.Vibration);
+        return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Vibration);
     }
     griffeInPosition(pPosition) {
         let count = 0;
@@ -52,39 +50,39 @@ class Fenster extends base_group_1.BaseGroup {
     initialize() {
         this.getHandle().forEach((griff) => {
             griff.addKippCallback((kipp) => {
-                if (!(kipp && this.griffeInPosition(FensterPosition_1.FensterPosition.offen) === 0)) {
+                if (!(kipp && this.griffeInPosition(models_1.FensterPosition.offen) === 0)) {
                     return;
                 }
                 this.getVibration().forEach((element) => {
-                    element.vibrationBlocked = true;
+                    element.vibrationBlockedByGriff = true;
                 });
-                const timeOfDay = time_callback_service_1.TimeCallbackService.dayType(this.getRoom().settings.rolloOffset);
-                if (time_callback_service_1.TimeCallbackService.darkOutsideOrNight(timeOfDay)) {
-                    ShutterService_1.ShutterService.windowAllMiddle(this);
+                const timeOfDay = services_1.TimeCallbackService.dayType(this.getRoom().settings.rolloOffset);
+                if (services_1.TimeCallbackService.darkOutsideOrNight(timeOfDay)) {
+                    services_1.ShutterService.windowAllMiddle(this);
                 }
                 else {
-                    ShutterService_1.ShutterService.windowAllUp(this);
+                    services_1.ShutterService.windowAllUp(this);
                 }
             });
             griff.addOffenCallback((offen) => {
                 if (offen) {
                     this.getVibration().forEach((element) => {
-                        element.vibrationBlocked = true;
+                        element.vibrationBlockedByGriff = true;
                     });
-                    ShutterService_1.ShutterService.windowAllUp(this);
+                    services_1.ShutterService.windowAllUp(this);
                     return;
                 }
             });
             griff.addClosedCallback((geschlossen) => {
                 if (geschlossen &&
-                    this.griffeInPosition(FensterPosition_1.FensterPosition.offen) === 0 &&
-                    this.griffeInPosition(FensterPosition_1.FensterPosition.kipp) === 0) {
+                    this.griffeInPosition(models_1.FensterPosition.offen) === 0 &&
+                    this.griffeInPosition(models_1.FensterPosition.kipp) === 0) {
                     const now = new Date().getTime();
                     this.getVibration().forEach((element) => {
-                        this.log(logLevel_1.LogLevel.Debug, `Starte Timeout für Vibrationsdeaktivierung für ${element.info.customName}`);
-                        utils_1.Utils.guardedTimeout(() => {
-                            if (element.vibrationBlockedTimeStamp < now) {
-                                element.vibrationBlocked = false;
+                        this.log(models_2.LogLevel.Debug, `Starte Timeout für Vibrationsdeaktivierung für ${element.info.customName}`);
+                        services_1.Utils.guardedTimeout(() => {
+                            if (element.vibrationBlockedByGriffTimeStamp < now) {
+                                element.vibrationBlockedByGriff = false;
                             }
                         }, 12000);
                     });
@@ -92,7 +90,7 @@ class Fenster extends base_group_1.BaseGroup {
                 }
             });
         });
-        utils_1.Utils.guardedTimeout(() => {
+        services_1.Utils.guardedTimeout(() => {
             this.getShutter().forEach((shutter) => {
                 shutter.fenster = this;
             });
@@ -102,13 +100,13 @@ class Fenster extends base_group_1.BaseGroup {
         }, 5, this);
     }
     rolloPositionChange(pValue) {
-        this.log(logLevel_1.LogLevel.Debug, `Rollo Position Change in ${this.roomName} to ${pValue}`);
+        this.log(models_2.LogLevel.Debug, `Rollo Position Change in ${this.roomName} to ${pValue}`);
         if (pValue === 0 || pValue === 100) {
             this.getRoom().setLightTimeBased(true);
         }
     }
     restoreDesiredPosition() {
-        ShutterService_1.ShutterService.windowAllToPosition(this, this.desiredPosition, false);
+        services_1.ShutterService.windowAllToPosition(this, this.desiredPosition, false);
     }
 }
 exports.Fenster = Fenster;

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

@@ -7,8 +7,9 @@ export declare class FensterGroup extends BaseGroup {
     allRolloUp(savePosition?: boolean): void;
     allRolloToLevel(level: number, savePosition?: boolean): void;
     initialize(): void;
-    private sunsetDown;
     setRolloByWeatherStatus(): void;
     sunriseUp(initial?: boolean): void;
     restoreRolloPosition(recalc?: boolean): void;
+    changeVibrationMotionBlock(block: boolean): void;
+    private sunsetDown;
 }

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

@@ -1,13 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FensterGroup = void 0;
-const timeCallback_1 = require("../../../models/timeCallback");
-const utils_1 = require("../../services/utils/utils");
-const weather_service_1 = require("../../services/weather/weather-service");
-const FensterPosition_1 = require("../models/FensterPosition");
-const logLevel_1 = require("../../../models/logLevel");
-const time_callback_service_1 = require("../../services/time-callback-service");
-const ShutterService_1 = require("../../services/ShutterService");
+const models_1 = require("../../../models");
+const services_1 = require("../../services");
+const models_2 = require("../models");
 const base_group_1 = require("./base-group");
 const group_type_1 = require("./group-type");
 class FensterGroup extends base_group_1.BaseGroup {
@@ -19,7 +15,7 @@ class FensterGroup extends base_group_1.BaseGroup {
         this.fenster.forEach((f) => {
             if (savePosition)
                 f.desiredPosition = 0;
-            ShutterService_1.ShutterService.windowAllDown(f, initial);
+            services_1.ShutterService.windowAllDown(f, initial);
         });
     }
     allRolloUp(savePosition = false) {
@@ -27,7 +23,7 @@ class FensterGroup extends base_group_1.BaseGroup {
             if (savePosition) {
                 f.desiredPosition = 100;
             }
-            ShutterService_1.ShutterService.windowAllUp(f);
+            services_1.ShutterService.windowAllUp(f);
         });
     }
     allRolloToLevel(level, savePosition = false) {
@@ -35,56 +31,48 @@ class FensterGroup extends base_group_1.BaseGroup {
             if (savePosition) {
                 f.desiredPosition = level;
             }
-            ShutterService_1.ShutterService.windowAllToPosition(f, level, false);
+            services_1.ShutterService.windowAllToPosition(f, level, false);
         });
     }
     initialize() {
         const room = this.getRoom();
         if (room.settings.sonnenAufgangRollos && room.settings.rolloOffset) {
-            this.log(logLevel_1.LogLevel.Trace, `Sonnenaufgang TimeCallback für ${this.roomName} hinzufügen`);
-            room.sonnenAufgangCallback = new timeCallback_1.TimeCallback(`${this.roomName} Sonnenaufgang Rollos`, timeCallback_1.TimeCallbackType.Sunrise, () => {
+            this.log(models_1.LogLevel.Trace, `Sonnenaufgang TimeCallback für ${this.roomName} hinzufügen`);
+            room.sonnenAufgangCallback = new models_1.TimeCallback(`${this.roomName} Sonnenaufgang Rollos`, models_1.TimeCallbackType.Sunrise, () => {
                 if (room.skipNextRolloUp) {
                     room.skipNextRolloUp = false;
                     return;
                 }
                 this.sunriseUp();
             }, room.settings.rolloOffset.sunrise, undefined, undefined, room.settings.rolloOffset);
-            if (!time_callback_service_1.TimeCallbackService.darkOutsideOrNight(time_callback_service_1.TimeCallbackService.dayType(room.settings.rolloOffset))) {
+            if (!services_1.TimeCallbackService.darkOutsideOrNight(services_1.TimeCallbackService.dayType(room.settings.rolloOffset))) {
                 this.sunriseUp(true);
             }
-            time_callback_service_1.TimeCallbackService.addCallback(room.sonnenAufgangCallback);
+            services_1.TimeCallbackService.addCallback(room.sonnenAufgangCallback);
         }
         if (room.settings.sonnenUntergangRollos && room.settings.rolloOffset) {
-            room.sonnenUntergangCallback = new timeCallback_1.TimeCallback(`${this.roomName} Sonnenuntergang Rollo`, timeCallback_1.TimeCallbackType.SunSet, () => {
+            room.sonnenUntergangCallback = new models_1.TimeCallback(`${this.roomName} Sonnenuntergang Rollo`, models_1.TimeCallbackType.SunSet, () => {
                 this.sunsetDown();
             }, room.settings.rolloOffset.sunset);
-            if (time_callback_service_1.TimeCallbackService.darkOutsideOrNight(time_callback_service_1.TimeCallbackService.dayType(room.settings.rolloOffset))) {
-                utils_1.Utils.guardedTimeout(() => {
+            if (services_1.TimeCallbackService.darkOutsideOrNight(services_1.TimeCallbackService.dayType(room.settings.rolloOffset))) {
+                services_1.Utils.guardedTimeout(() => {
                     this.allRolloDown(true, true);
                 }, 60000, this);
             }
-            time_callback_service_1.TimeCallbackService.addCallback(room.sonnenUntergangCallback);
+            services_1.TimeCallbackService.addCallback(room.sonnenUntergangCallback);
         }
         if (room.settings.rolloHeatReduction) {
-            utils_1.Utils.guardedInterval(this.setRolloByWeatherStatus, 15 * 60 * 1000, this, true);
-            utils_1.Utils.guardedTimeout(this.setRolloByWeatherStatus, 2 * 60 * 1000, this);
+            services_1.Utils.guardedInterval(this.setRolloByWeatherStatus, 15 * 60 * 1000, this, true);
+            services_1.Utils.guardedTimeout(this.setRolloByWeatherStatus, 2 * 60 * 1000, this);
         }
         this.fenster.forEach((f) => {
             f.initialize();
         });
     }
-    sunsetDown() {
-        var _a, _b;
-        this.allRolloToLevel(0, true);
-        const room = this.getRoom();
-        if (((_a = room.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent()) && room.settings.lampOffset) {
-            (_b = room.LampenGroup) === null || _b === void 0 ? void 0 : _b.switchTimeConditional(time_callback_service_1.TimeCallbackService.dayType(room.settings.lampOffset));
-        }
-    }
     setRolloByWeatherStatus() {
         const room = this.getRoom();
-        const timeOfDay = time_callback_service_1.TimeCallbackService.dayType(room.settings.rolloOffset);
-        const darkOutside = time_callback_service_1.TimeCallbackService.darkOutsideOrNight(timeOfDay);
+        const timeOfDay = services_1.TimeCallbackService.dayType(room.settings.rolloOffset);
+        const darkOutside = services_1.TimeCallbackService.darkOutsideOrNight(timeOfDay);
         this.fenster.forEach((f) => {
             var _a, _b, _c, _d;
             if (f.getShutter().length === 0) {
@@ -96,15 +84,15 @@ class FensterGroup extends base_group_1.BaseGroup {
             }
             let desiredPos = f.desiredPosition;
             if (desiredPos > 0) {
-                weather_service_1.WeatherService.weatherRolloPosition(desiredPos, (_b = (_a = room.HeatGroup) === null || _a === void 0 ? void 0 : _a.desiredTemp) !== null && _b !== void 0 ? _b : -99, (_d = (_c = room.HeatGroup) === null || _c === void 0 ? void 0 : _c.currentTemp) !== null && _d !== void 0 ? _d : -99);
+                services_1.WeatherService.weatherRolloPosition(desiredPos, (_b = (_a = room.HeatGroup) === null || _a === void 0 ? void 0 : _a.desiredTemp) !== null && _b !== void 0 ? _b : -99, (_d = (_c = room.HeatGroup) === null || _c === void 0 ? void 0 : _c.currentTemp) !== null && _d !== void 0 ? _d : -99);
             }
-            if (f.griffeInPosition(FensterPosition_1.FensterPosition.offen) > 0 && desiredPos < 100) {
+            if (f.griffeInPosition(models_2.FensterPosition.offen) > 0 && desiredPos < 100) {
                 return;
             }
-            if (f.griffeInPosition(FensterPosition_1.FensterPosition.kipp) > 0) {
+            if (f.griffeInPosition(models_2.FensterPosition.kipp) > 0) {
                 desiredPos = Math.max(30, desiredPos);
             }
-            ShutterService_1.ShutterService.windowAllToPosition(f, desiredPos, false, true);
+            services_1.ShutterService.windowAllToPosition(f, desiredPos, false, true);
         });
     }
     sunriseUp(initial = false) {
@@ -112,7 +100,7 @@ class FensterGroup extends base_group_1.BaseGroup {
             if (f.noRolloOnSunrise || f.getShutter().length === 0) {
                 return;
             }
-            this.log(logLevel_1.LogLevel.Debug, `Fahre das Rollo zum Sonnenaufgang ${initial ? '(ggf. nachträglich)' : ''} hoch`);
+            this.log(models_1.LogLevel.Debug, `Fahre das Rollo zum Sonnenaufgang ${initial ? '(ggf. nachträglich)' : ''} hoch`);
             f.setDesiredPosition(100);
         });
     }
@@ -123,12 +111,30 @@ class FensterGroup extends base_group_1.BaseGroup {
             });
             return;
         }
-        if (!time_callback_service_1.TimeCallbackService.darkOutsideOrNight(time_callback_service_1.TimeCallbackService.dayType(this.getRoom().settings.rolloOffset))) {
+        if (!services_1.TimeCallbackService.darkOutsideOrNight(services_1.TimeCallbackService.dayType(this.getRoom().settings.rolloOffset))) {
             this.sunriseUp(true);
         }
         else {
             this.sunsetDown();
         }
     }
+    changeVibrationMotionBlock(block) {
+        this.fenster.forEach((f) => {
+            if (f.getVibration().length === 0) {
+                return;
+            }
+            f.getVibration().forEach((v) => {
+                v.vibrationBlockedByMotion = block;
+            });
+        });
+    }
+    sunsetDown() {
+        var _a, _b;
+        this.allRolloToLevel(0, true);
+        const room = this.getRoom();
+        if (((_a = room.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent()) && room.settings.lampOffset) {
+            (_b = room.LampenGroup) === null || _b === void 0 ? void 0 : _b.switchTimeConditional(services_1.TimeCallbackService.dayType(room.settings.lampOffset));
+        }
+    }
 }
 exports.FensterGroup = FensterGroup;

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

@@ -1,12 +1,12 @@
-import { HmIpHeizgruppe } from '../hmIPDevices/hmIpHeizgruppe';
+import { HmIpHeizgruppe } from '../hmIPDevices';
 import { BaseGroup } from './base-group';
 import { iTemperaturSensor } from '../iTemperaturSensor';
 import { iHumiditySensor } from '../iHumiditySensor';
 export declare class HeatGroup extends BaseGroup {
+    constructor(roomName: string, heaterIds: string[], tempSensorIds: string[], humiditySensorIds: string[]);
     get currentTemp(): number;
     get desiredTemp(): number;
     getHeater(): HmIpHeizgruppe[];
     getTempSensors(): iTemperaturSensor[];
     getHumiditySensors(): iHumiditySensor[];
-    constructor(roomName: string, heaterIds: string[], tempSensorIds: string[], humiditySensorIds: string[]);
 }

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

@@ -6,6 +6,12 @@ const group_type_1 = require("./group-type");
 const device_cluster_type_1 = require("../device-cluster-type");
 const device_list_1 = require("../device-list");
 class HeatGroup extends base_group_1.BaseGroup {
+    constructor(roomName, heaterIds, tempSensorIds, humiditySensorIds) {
+        super(roomName, group_type_1.GroupType.Heating);
+        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Heater, new device_list_1.DeviceList(heaterIds));
+        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.TemperaturSensor, new device_list_1.DeviceList(tempSensorIds));
+        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.HumiditySensor, new device_list_1.DeviceList(humiditySensorIds));
+    }
     get currentTemp() {
         if (this.getHeater().length === 0) {
             return -99;
@@ -31,16 +37,10 @@ class HeatGroup extends base_group_1.BaseGroup {
         return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.Heater);
     }
     getTempSensors() {
-        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.TemperaturSensor);
+        return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.TemperaturSensor);
     }
     getHumiditySensors() {
-        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.HumiditySensor);
-    }
-    constructor(roomName, heaterIds, tempSensorIds, humiditySensorIds) {
-        super(roomName, group_type_1.GroupType.Heating);
-        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Heater, new device_list_1.DeviceList(heaterIds));
-        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.TemperaturSensor, new device_list_1.DeviceList(tempSensorIds));
-        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.HumiditySensor, new device_list_1.DeviceList(humiditySensorIds));
+        return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.HumiditySensor);
     }
 }
 exports.HeatGroup = HeatGroup;

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

@@ -1,8 +1,7 @@
-import { ZigbeeIkeaSteckdose } from '../zigbee';
-import { TimeOfDay } from '../../services';
-import { ZigbeeIlluLedRGBCCT } from '../zigbee';
+import { ZigbeeIkeaSteckdose, ZigbeeIlluLedRGBCCT } from '../zigbee';
 import { BaseGroup } from './base-group';
 import { iLamp } from '../iLamp';
+import { TimeOfDay } from '../../../models';
 export declare class LampenGroup extends BaseGroup {
     constructor(roomName: string, lampenIds?: string[], steckerIds?: string[], ledIds?: string[]);
     anyLightsOwn(): boolean;
@@ -11,7 +10,7 @@ export declare class LampenGroup extends BaseGroup {
     getStecker(): ZigbeeIkeaSteckdose[];
     switchAll(target: boolean, force?: boolean): void;
     switchTimeConditional(time: TimeOfDay): void;
-    setAllLampen(pValue: boolean, time?: TimeOfDay, force?: boolean): void;
+    setAllLampen(pValue: boolean, time?: TimeOfDay, force?: boolean, timeout?: number): void;
     setAllStecker(pValue: boolean, time?: TimeOfDay, force?: boolean): void;
     setAllLED(pValue: boolean, brightness?: number, color?: string, colortemp?: number): void;
 }

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

@@ -34,7 +34,7 @@ class LampenGroup extends base_group_1.BaseGroup {
         return false;
     }
     getLampen() {
-        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.Lamps);
+        return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Lamps);
     }
     getLED() {
         return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.LED);
@@ -54,30 +54,30 @@ class LampenGroup extends base_group_1.BaseGroup {
         let resultLampen = false;
         let resultSteckdosen = false;
         if (this.getLED().length > 0) {
-            this.log(models_1.LogLevel.Trace, `Set LEDs time based for time "${services_1.TimeOfDay[time]}"`);
+            this.log(models_1.LogLevel.Trace, `Set LEDs time based for time "${models_1.TimeOfDay[time]}"`);
             this.getLED().forEach((s) => {
                 s.setTimeBased(time);
             });
         }
         else if (this.getStecker().length > 0) {
-            this.log(models_1.LogLevel.Trace, `Set outlets time based for time "${services_1.TimeOfDay[time]}"`);
+            this.log(models_1.LogLevel.Trace, `Set outlets time based for time "${models_1.TimeOfDay[time]}"`);
             resultSteckdosen = darkOutside;
         }
         else {
-            this.log(models_1.LogLevel.Trace, `Set Lamps time based for time "${services_1.TimeOfDay[time]}"`);
+            this.log(models_1.LogLevel.Trace, `Set Lamps time based for time "${models_1.TimeOfDay[time]}"`);
             resultLampen = darkOutside;
         }
         this.setAllLampen(resultLampen, time);
         this.setAllStecker(resultSteckdosen, time);
     }
-    setAllLampen(pValue, time, force = false) {
+    setAllLampen(pValue, time, force = false, timeout) {
         this.getLampen().forEach((s) => {
             if (!pValue ||
                 time === undefined ||
-                (time === services_1.TimeOfDay.Night && s.settings.nightOn) ||
-                (time === services_1.TimeOfDay.BeforeSunrise && s.settings.dawnOn) ||
-                (time === services_1.TimeOfDay.AfterSunset && s.settings.duskOn)) {
-                const timeout = pValue && force ? 30 * 60 * 1000 : -1;
+                (time === models_1.TimeOfDay.Night && s.settings.nightOn) ||
+                (time === models_1.TimeOfDay.BeforeSunrise && s.settings.dawnOn) ||
+                (time === models_1.TimeOfDay.AfterSunset && s.settings.duskOn)) {
+                timeout !== null && timeout !== void 0 ? timeout : (timeout = pValue && force ? 30 * 60 * 1000 : -1);
                 if (pValue && time !== undefined) {
                     s.setTimeBased(time, timeout, force);
                 }
@@ -91,9 +91,9 @@ class LampenGroup extends base_group_1.BaseGroup {
         this.getStecker().forEach((s) => {
             if (!pValue ||
                 time === undefined ||
-                (time === services_1.TimeOfDay.Night && s.settings.nightOn) ||
-                (time === services_1.TimeOfDay.BeforeSunrise && s.settings.dawnOn) ||
-                (time === services_1.TimeOfDay.AfterSunset && s.settings.duskOn)) {
+                (time === models_1.TimeOfDay.Night && s.settings.nightOn) ||
+                (time === models_1.TimeOfDay.BeforeSunrise && s.settings.dawnOn) ||
+                (time === models_1.TimeOfDay.AfterSunset && s.settings.duskOn)) {
                 const timeout = pValue && force ? 30 * 60 * 1000 : -1;
                 s.setStecker(pValue, timeout, force);
             }

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

@@ -1,23 +1,22 @@
-import { HmIpPraezenz } from '../hmIPDevices/hmIpPraezenz';
-import { HmIpBewegung } from '../hmIPDevices/hmIpBewegung';
+import { HmIpPraezenz } from '../hmIPDevices';
 import { BaseGroup } from './base-group';
-import { ZigbeeMotionSensor } from '../zigbee/zigbeeMotionSensor';
+import { iMotionSensor } from '../iMotionSensor';
 export declare class PraesenzGroup extends BaseGroup {
     private _lastMovement;
     private _lastLeftTimeout;
-    getMotionDetector(): Array<HmIpBewegung | ZigbeeMotionSensor>;
-    getPresenceSensors(): HmIpPraezenz[];
     constructor(roomName: string, presenceDetectorIds: string[], motionSensorIds: string[]);
+    getMotionDetector(): Array<iMotionSensor>;
+    getPresenceSensors(): HmIpPraezenz[];
     initCallbacks(): void;
     presentAmount(): number;
     anyPresent(): boolean;
     lastLeftCB(val: boolean, cb: () => void): void;
+    addLastLeftCallback(cb: () => void): void;
+    addFirstEnterCallback(cb: () => void): void;
     /**
      * In case of an existing delayed last left callback timeout, this removes it.
      * @private
      */
     private resetLastLeftTimeout;
-    addLastLeftCallback(cb: () => void): void;
     private firstEnterCallback;
-    addFirstEnterCallback(cb: () => void): void;
 }

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

@@ -1,11 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PraesenzGroup = void 0;
-const timeCallback_1 = require("../../../models/timeCallback");
-const utils_1 = require("../../services/utils/utils");
-const logLevel_1 = require("../../../models/logLevel");
-const time_callback_service_1 = require("../../services/time-callback-service");
-const room_service_1 = require("../../services/room-service/room-service");
+const models_1 = require("../../../models");
+const services_1 = require("../../services");
 const base_group_1 = require("./base-group");
 const device_cluster_type_1 = require("../device-cluster-type");
 const group_type_1 = require("./group-type");
@@ -30,31 +27,35 @@ class PraesenzGroup extends base_group_1.BaseGroup {
                 if (!val) {
                     return;
                 }
-                if (room_service_1.RoomService.awayModeActive || (room_service_1.RoomService.nightAlarmActive && !p.excludeFromNightAlarm)) {
-                    room_service_1.RoomService.startIntrusionAlarm(this.getRoom(), p);
+                if (services_1.RoomService.awayModeActive || (services_1.RoomService.nightAlarmActive && !p.excludeFromNightAlarm)) {
+                    services_1.RoomService.startIntrusionAlarm(this.getRoom(), p);
                 }
-                room_service_1.RoomService.movementHistory.add(`${utils_1.Utils.nowString()}: Raum "${this.roomName}" Gerät "${p.info.fullName}"`);
+                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;
                 if (!val) {
                     return;
                 }
-                if (room_service_1.RoomService.awayModeActive || (room_service_1.RoomService.nightAlarmActive && !b.excludeFromNightAlarm)) {
-                    room_service_1.RoomService.startIntrusionAlarm(this.getRoom(), b);
+                if (services_1.RoomService.awayModeActive || (services_1.RoomService.nightAlarmActive && !b.settings.excludeFromNightAlarm)) {
+                    services_1.RoomService.startIntrusionAlarm(this.getRoom(), b);
+                }
+                if (!b.settings.seesWindow) {
+                    (_a = this.getRoom().FensterGroup) === null || _a === void 0 ? void 0 : _a.changeVibrationMotionBlock(true);
                 }
-                room_service_1.RoomService.movementHistory.add(`${utils_1.Utils.nowString()}: Raum "${this.roomName}" Gerät "${b.info.fullName}"`);
+                services_1.RoomService.movementHistory.add(`${services_1.Utils.nowString()}: Raum "${this.roomName}" Gerät "${b.info.fullName}"`);
             });
         });
         if (this.getRoom().settings.lichtSonnenAufgangAus && this.getRoom().settings.lampOffset) {
-            const cb = new timeCallback_1.TimeCallback(`${this.roomName} Morgens Lampe aus`, timeCallback_1.TimeCallbackType.Sunrise, () => {
+            const cb = new models_1.TimeCallback(`${this.roomName} Morgens Lampe aus`, models_1.TimeCallbackType.Sunrise, () => {
                 var _a;
-                this.log(logLevel_1.LogLevel.Info, `Es ist hell genug --> Schalte Lampen im ${this.roomName} aus`);
+                this.log(models_1.LogLevel.Info, `Es ist hell genug --> Schalte Lampen im ${this.roomName} aus`);
                 (_a = this.getRoom().LampenGroup) === null || _a === void 0 ? void 0 : _a.switchAll(false);
             }, this.getRoom().settings.lampOffset.sunrise);
             this.getRoom().sonnenAufgangLichtCallback = cb;
-            time_callback_service_1.TimeCallbackService.addCallback(cb);
+            services_1.TimeCallbackService.addCallback(cb);
         }
         this.addLastLeftCallback(() => {
             var _a;
@@ -62,7 +63,7 @@ class PraesenzGroup extends base_group_1.BaseGroup {
         });
         if (this.getRoom().settings.lampenBeiBewegung) {
             this.addFirstEnterCallback(() => {
-                this.log(logLevel_1.LogLevel.DeepTrace, `Bewegung im Raum ${this.roomName} festgestellt --> Licht einschalten`);
+                this.log(models_1.LogLevel.DeepTrace, `Bewegung im Raum ${this.roomName} festgestellt --> Licht einschalten`);
                 this.getRoom().setLightTimeBased();
             });
         }
@@ -95,36 +96,31 @@ class PraesenzGroup extends base_group_1.BaseGroup {
         return false;
     }
     lastLeftCB(val, cb) {
+        var _a;
         if (val || this.anyPresent()) {
             this.resetLastLeftTimeout();
             return;
         }
-        let timeAfterReset = utils_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().settings.movementResetTimer * 1000;
+        let timeAfterReset = services_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().settings.movementResetTimer * 1000;
         if (timeAfterReset > 0) {
-            this.log(logLevel_1.LogLevel.Debug, `Movement reset. Active Motions: ${this.presentAmount()}\tTime after Last Movement including Reset: ${timeAfterReset}`);
+            this.log(models_1.LogLevel.Debug, `Movement reset. Active Motions: ${this.presentAmount()}\tTime after Last Movement including Reset: ${timeAfterReset}`);
+            (_a = this.getRoom().FensterGroup) === null || _a === void 0 ? void 0 : _a.changeVibrationMotionBlock(false);
             cb();
             return;
         }
-        this.log(logLevel_1.LogLevel.Debug, `Movement reset in ${this.roomName} delayed.`);
+        this.log(models_1.LogLevel.Debug, `Movement reset in ${this.roomName} delayed.`);
         this.resetLastLeftTimeout();
-        this._lastLeftTimeout = utils_1.Utils.guardedTimeout(() => {
+        this._lastLeftTimeout = services_1.Utils.guardedTimeout(() => {
+            var _a;
             timeAfterReset =
-                utils_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().settings.movementResetTimer * 1000;
-            this.log(logLevel_1.LogLevel.Debug, `Delayed Movement reset. Active Motions: ${this.presentAmount()}\tTime after Last Movement including Reset: ${timeAfterReset}`);
+                services_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().settings.movementResetTimer * 1000;
+            this.log(models_1.LogLevel.Debug, `Delayed Movement reset. Active Motions: ${this.presentAmount()}\tTime after Last Movement including Reset: ${timeAfterReset}`);
             if (!this.anyPresent() && timeAfterReset > 0) {
+                (_a = this.getRoom().FensterGroup) === null || _a === void 0 ? void 0 : _a.changeVibrationMotionBlock(false);
                 cb();
             }
         }, Math.abs(timeAfterReset) + 500, this);
     }
-    /**
-     * In case of an existing delayed last left callback timeout, this removes it.
-     * @private
-     */
-    resetLastLeftTimeout() {
-        if (this._lastLeftTimeout !== null) {
-            clearTimeout(this._lastLeftTimeout);
-        }
-    }
     addLastLeftCallback(cb) {
         this.getPresenceSensors().forEach((p) => {
             p.addPresenceCallback((val) => {
@@ -137,16 +133,6 @@ class PraesenzGroup extends base_group_1.BaseGroup {
             });
         });
     }
-    firstEnterCallback(val, cb) {
-        if (!val) {
-            return;
-        }
-        this._lastMovement = new Date();
-        if (this.presentAmount() > 1) {
-            return;
-        }
-        cb();
-    }
     addFirstEnterCallback(cb) {
         this.getPresenceSensors().forEach((p) => {
             p.addPresenceCallback((val) => {
@@ -159,5 +145,24 @@ class PraesenzGroup extends base_group_1.BaseGroup {
             });
         });
     }
+    /**
+     * In case of an existing delayed last left callback timeout, this removes it.
+     * @private
+     */
+    resetLastLeftTimeout() {
+        if (this._lastLeftTimeout !== null) {
+            clearTimeout(this._lastLeftTimeout);
+        }
+    }
+    firstEnterCallback(val, cb) {
+        if (!val) {
+            return;
+        }
+        this._lastMovement = new Date();
+        if (this.presentAmount() > 1) {
+            return;
+        }
+        cb();
+    }
 }
 exports.PraesenzGroup = PraesenzGroup;

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

@@ -1,7 +1,7 @@
 import { BaseGroup } from './base-group';
 import { iButtonSwitch } from '../iButtonSwitch';
 export declare class TasterGroup extends BaseGroup {
-    getButtons(): iButtonSwitch[];
     constructor(roomName: string, buttonIds: string[]);
+    getButtons(): iButtonSwitch[];
     initCallbacks(): void;
 }

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

@@ -7,13 +7,13 @@ const group_type_1 = require("./group-type");
 const device_list_1 = require("../device-list");
 const button_1 = require("../button");
 class TasterGroup extends base_group_1.BaseGroup {
-    getButtons() {
-        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.Buttons);
-    }
     constructor(roomName, buttonIds) {
         super(roomName, group_type_1.GroupType.Buttons);
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Buttons, new device_list_1.DeviceList(buttonIds));
     }
+    getButtons() {
+        return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Buttons);
+    }
     initCallbacks() {
         this.getButtons().forEach((t) => {
             var _a, _b, _c, _d, _e, _f, _g;