hoffmation-base 0.1.41-1 → 0.1.41-13

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

@@ -2,14 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeAquaraVibra = void 0;
 const deviceType_1 = require("../deviceType");
-const utils_1 = require("../../services/utils/utils");
-const polly_service_1 = require("../../services/Sonos/polly-service");
+const services_1 = require("../../services");
+const models_1 = require("../../../models");
 const zigbeeDevice_1 = require("./zigbeeDevice");
-const logLevel_1 = require("../../../models/logLevel");
-const sonos_service_1 = require("../../services/Sonos/sonos-service");
-const res_1 = require("../../services/Translation/res");
 class ZigbeeAquaraVibra extends zigbeeDevice_1.ZigbeeDevice {
-    // TODO Set Sensitivity
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraVibra);
         this.sensitivity = '';
@@ -21,63 +17,79 @@ class ZigbeeAquaraVibra extends zigbeeDevice_1.ZigbeeDevice {
         this.tiltAngleZ = 0;
         this.tilt = false;
         this.vibration = false;
-        this.vibrationBlockedTimeStamp = 0;
+        this.vibrationBlockedByGriffTimeStamp = 0;
+        this.vibrationBlockedByMotionTimeStamp = 0;
         this._idSensitivity = '';
-        this._vibrationBlocked = false;
-        this._alarmMessage = res_1.Res.vibrationAlarm(this.info.customName);
-        polly_service_1.PollyService.preloadTTS(this._alarmMessage);
+        // TODO Set Sensitivity
+        this._vibrationBlockedByGriff = false;
+        this._vibrationBlockedByMotion = false;
+        this._alarmMessage = services_1.Res.vibrationAlarm(this.info.customName);
+        services_1.PollyService.preloadTTS(this._alarmMessage);
         this._idSensitivity = `${this.info.fullID}.sensitivity`;
     }
-    set vibrationBlocked(pVal) {
-        this.log(logLevel_1.LogLevel.Debug, `${pVal ? 'Dea' : 'A'}ktiviere Vibrationsalarm für ${this.info.customName}`);
+    get vibrationBlockedByGriff() {
+        return this._vibrationBlockedByGriff;
+    }
+    set vibrationBlockedByGriff(pVal) {
+        this.log(models_1.LogLevel.Debug, `${pVal ? 'Dea' : 'A'}ktiviere Vibrationsalarm für ${this.info.customName} in Bezug auf den Fenstergriff`);
         if (pVal) {
-            this.vibrationBlockedTimeStamp = new Date().getTime();
+            this.vibrationBlockedByGriffTimeStamp = new Date().getTime();
         }
-        this._vibrationBlocked = pVal;
+        this._vibrationBlockedByGriff = pVal;
+    }
+    get vibrationBlockedByMotion() {
+        return this._vibrationBlockedByMotion;
+    }
+    set vibrationBlockedByMotion(pVal) {
+        this.log(models_1.LogLevel.Debug, `${pVal ? 'Dea' : 'A'}ktiviere Vibrationsalarm für ${this.info.customName} in Bezug auf Bewegung`);
+        if (pVal) {
+            this.vibrationBlockedByMotionTimeStamp = services_1.Utils.nowMS();
+        }
+        this._vibrationBlockedByMotion = pVal;
     }
     update(idSplit, state, initial = false) {
-        this.log(logLevel_1.LogLevel.DeepTrace, `Stecker Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        this.log(models_1.LogLevel.DeepTrace, `Stecker Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case 'sensitivity':
-                this.log(initial ? logLevel_1.LogLevel.DeepTrace : logLevel_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf Sensitivity: ${state.val}`);
+                this.log(initial ? models_1.LogLevel.DeepTrace : models_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf Sensitivity: ${state.val}`);
                 this.tiltAngleZ = state.val;
                 break;
             case 'tilt_angle_z':
-                this.log(initial ? logLevel_1.LogLevel.DeepTrace : logLevel_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf Winkel Z: ${state.val}`);
+                this.log(initial ? models_1.LogLevel.DeepTrace : models_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf Winkel Z: ${state.val}`);
                 this.tiltAngleZ = state.val;
                 break;
             case 'tilt_angle_y':
-                this.log(initial ? logLevel_1.LogLevel.DeepTrace : logLevel_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf Winkel Y: ${state.val}`);
+                this.log(initial ? models_1.LogLevel.DeepTrace : models_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf Winkel Y: ${state.val}`);
                 this.tiltAngleY = state.val;
                 break;
             case 'tilt_angle_x':
-                this.log(initial ? logLevel_1.LogLevel.DeepTrace : logLevel_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf Winkel X: ${state.val}`);
+                this.log(initial ? models_1.LogLevel.DeepTrace : models_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf Winkel X: ${state.val}`);
                 this.tiltAngleX = state.val;
                 break;
             case 'vibration':
-                this.log(initial ? logLevel_1.LogLevel.DeepTrace : logLevel_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf Vibration erkannt: ${state.val}`);
+                this.log(initial ? models_1.LogLevel.DeepTrace : models_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf Vibration erkannt: ${state.val}`);
                 this.vibration = state.val;
                 if (this.vibration) {
-                    utils_1.Utils.guardedTimeout(() => {
+                    services_1.Utils.guardedTimeout(() => {
                         this.alarmCheck();
                     }, 8500, this);
                 }
                 break;
             case 'tilt_angle_y_abs':
-                this.log(initial ? logLevel_1.LogLevel.DeepTrace : logLevel_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf absoluten Winkel Y: ${state.val}`);
+                this.log(initial ? models_1.LogLevel.DeepTrace : models_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf absoluten Winkel Y: ${state.val}`);
                 this.tiltAngleYAbs = state.val;
                 break;
             case 'tilt_angle_X_abs':
-                this.log(initial ? logLevel_1.LogLevel.DeepTrace : logLevel_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf absoluten Winkel X: ${state.val}`);
+                this.log(initial ? models_1.LogLevel.DeepTrace : models_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf absoluten Winkel X: ${state.val}`);
                 this.tiltAngleXAbs = state.val;
                 break;
             case 'tilt_angle':
-                this.log(initial ? logLevel_1.LogLevel.DeepTrace : logLevel_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf Winkel: ${state.val}`);
+                this.log(initial ? models_1.LogLevel.DeepTrace : models_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf Winkel: ${state.val}`);
                 this.tiltAngle = state.val;
                 break;
             case 'tilt':
-                this.log(initial ? logLevel_1.LogLevel.DeepTrace : logLevel_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf Winkel: ${state.val}`);
+                this.log(initial ? models_1.LogLevel.DeepTrace : models_1.LogLevel.Trace, `Vibrationssensor Update für ${this.info.customName} auf Winkel: ${state.val}`);
                 this.tilt = state.val;
                 break;
         }
@@ -93,23 +105,27 @@ class ZigbeeAquaraVibra extends zigbeeDevice_1.ZigbeeDevice {
                 break;
         }
         if (this._idSensitivity === '') {
-            this.log(logLevel_1.LogLevel.Error, `Keine Switch ID bekannt.`);
+            this.log(models_1.LogLevel.Error, `Keine Switch ID bekannt.`);
             return;
         }
-        this.log(logLevel_1.LogLevel.Debug, `Vibration Sensitivität schalten Wert: ${result}`);
+        this.log(models_1.LogLevel.Debug, `Vibration Sensitivität schalten Wert: ${result}`);
         this.setState(this._idSensitivity, result, undefined, (err) => {
             console.log(`Stecker schalten ergab Fehler: ${err}`);
         });
     }
     alarmCheck() {
-        this.log(logLevel_1.LogLevel.Debug, `Alarmcheck für ${this.info.customName} Alarmblock Wert: ${this._vibrationBlocked}`);
-        if (this._vibrationBlocked) {
-            this.log(logLevel_1.LogLevel.Debug, `Fenster offen, ignoriere Vibrationsalarm bei ${this.info.customName}`);
+        this.log(models_1.LogLevel.Debug, `Alarmcheck für ${this.info.customName} Alarmblock Wert: ${this._vibrationBlockedByGriff}`);
+        if (this._vibrationBlockedByGriff) {
+            this.log(models_1.LogLevel.Debug, `Fenster offen, ignoriere Vibrationsalarm bei ${this.info.customName}`);
+            return;
+        }
+        if (this._vibrationBlockedByMotion) {
+            this.log(models_1.LogLevel.Debug, `Deaktivierende Bewegung, ignoriere Vibrationsalarm bei ${this.info.customName}`);
             return;
         }
         const message = this._alarmMessage;
-        sonos_service_1.SonosService.speakOnAll(message);
-        this.log(logLevel_1.LogLevel.Alert, message);
+        services_1.SonosService.speakOnAll(message);
+        this.log(models_1.LogLevel.Alert, message);
     }
 }
 exports.ZigbeeAquaraVibra = ZigbeeAquaraVibra;

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

@@ -1,9 +1,8 @@
 /// <reference types="iobroker" />
-import { DimmerSettings } from '../../../models/deviceSettings/dimmerSettings';
+import { DimmerSettings, TimeOfDay } from '../../../models';
 import { DeviceInfo } from '../DeviceInfo';
 import { iLamp } from '../iLamp';
 import { ZigbeeDevice } from './zigbeeDevice';
-import { TimeOfDay } from '../../services/time-callback-service';
 export declare class ZigbeeIlluDimmer extends ZigbeeDevice implements iLamp {
     lightOn: boolean;
     queuedValue: boolean | null;

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

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeIlluDimmer = void 0;
-const dimmerSettings_1 = require("../../../models/deviceSettings/dimmerSettings");
+const models_1 = require("../../../models");
 const deviceType_1 = require("../deviceType");
-const utils_1 = require("../../services/utils/utils");
+const services_1 = require("../../services");
 const zigbeeDevice_1 = require("./zigbeeDevice");
-const logLevel_1 = require("../../../models/logLevel");
-const time_callback_service_1 = require("../../services/time-callback-service");
 class ZigbeeIlluDimmer extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeIlluDimmer);
@@ -14,7 +12,7 @@ class ZigbeeIlluDimmer extends zigbeeDevice_1.ZigbeeDevice {
         this.queuedValue = null;
         this.brightness = 0;
         this.transitionTime = 0;
-        this.settings = new dimmerSettings_1.DimmerSettings();
+        this.settings = new models_1.DimmerSettings();
         this.stateID = 'state';
         this.brightnessID = 'brightness';
         this.transitionID = 'transition_time';
@@ -26,35 +24,35 @@ class ZigbeeIlluDimmer extends zigbeeDevice_1.ZigbeeDevice {
     }
     update(idSplit, state, initial = false) {
         this.queuedValue = null;
-        this.log(logLevel_1.LogLevel.DeepTrace, `Dimmer Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        this.log(models_1.LogLevel.DeepTrace, `Dimmer Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case 'state':
-                this.log(logLevel_1.LogLevel.Trace, `Dimmer Update für ${this.info.customName} auf ${state.val}`);
+                this.log(models_1.LogLevel.Trace, `Dimmer Update für ${this.info.customName} auf ${state.val}`);
                 this.lightOn = state.val;
                 break;
             case 'brightness':
-                this.log(logLevel_1.LogLevel.Trace, `Dimmer Helligkeit Update für ${this.info.customName} auf ${state.val}`);
+                this.log(models_1.LogLevel.Trace, `Dimmer Helligkeit Update für ${this.info.customName} auf ${state.val}`);
                 this.brightness = state.val;
                 break;
             case 'transition_time':
-                this.log(logLevel_1.LogLevel.Trace, `Dimmer Transition Time Update für ${this.info.customName} auf ${state.val}`);
+                this.log(models_1.LogLevel.Trace, `Dimmer Transition Time Update für ${this.info.customName} auf ${state.val}`);
                 this.transitionTime = state.val;
                 break;
         }
     }
     setTimeBased(time, timeout = -1, force = false) {
         switch (time) {
-            case time_callback_service_1.TimeOfDay.Night:
+            case models_1.TimeOfDay.Night:
                 this.setLight(true, timeout, force, this.settings.nightBrightness);
                 break;
-            case time_callback_service_1.TimeOfDay.AfterSunset:
+            case models_1.TimeOfDay.AfterSunset:
                 this.setLight(true, timeout, force, this.settings.dawnBrightness);
                 break;
-            case time_callback_service_1.TimeOfDay.BeforeSunrise:
+            case models_1.TimeOfDay.BeforeSunrise:
                 this.setLight(true, timeout, force, this.settings.duskBrightness);
                 break;
-            case time_callback_service_1.TimeOfDay.Daylight:
+            case models_1.TimeOfDay.Daylight:
                 this.setLight(true, timeout, force, this.settings.dayBrightness);
                 break;
         }
@@ -66,35 +64,35 @@ class ZigbeeIlluDimmer extends zigbeeDevice_1.ZigbeeDevice {
      */
     setLight(pValue, timeout = -1, force = false, brightness = -1, transitionTime = -1) {
         if (this.stateID === '') {
-            this.log(logLevel_1.LogLevel.Error, `Keine State ID bekannt.`);
+            this.log(models_1.LogLevel.Error, `Keine State ID bekannt.`);
             return;
         }
         if (!this.ioConn) {
-            this.log(logLevel_1.LogLevel.Error, `Keine Connection bekannt.`);
+            this.log(models_1.LogLevel.Error, `Keine Connection bekannt.`);
             return;
         }
         if (transitionTime > -1) {
             this.ioConn.setState(this.transitionID, transitionTime, (err) => {
                 if (err) {
-                    this.log(logLevel_1.LogLevel.Error, `Dimmer TransitionTime schalten ergab Fehler: ${err}`);
+                    this.log(models_1.LogLevel.Error, `Dimmer TransitionTime schalten ergab Fehler: ${err}`);
                 }
             });
         }
-        if (!force && utils_1.Utils.nowMS() < this.turnOffTime) {
-            this.log(logLevel_1.LogLevel.Debug, `Skip automatic command to ${pValue} as it is locked until ${new Date(this.turnOffTime).toLocaleTimeString()}`);
+        if (!force && services_1.Utils.nowMS() < this.turnOffTime) {
+            this.log(models_1.LogLevel.Debug, `Skip automatic command to ${pValue} as it is locked until ${new Date(this.turnOffTime).toLocaleTimeString()}`);
             return;
         }
         if (pValue && brightness === -1 && this.brightness < 10) {
             brightness = 10;
         }
-        this.log(logLevel_1.LogLevel.Debug, `Dimmer Schalten An: ${pValue} \t Helligkeit: ${brightness}%`);
+        this.log(models_1.LogLevel.Debug, `Dimmer Schalten An: ${pValue} \t Helligkeit: ${brightness}%`);
         this.setState(this.stateID, pValue);
         this.queuedValue = pValue;
         if (brightness > -1) {
             if (brightness < this.settings.turnOnThreshhold) {
                 this.setState(this.brightnessID, this.settings.turnOnThreshhold, () => {
-                    utils_1.Utils.guardedTimeout(() => {
-                        this.log(logLevel_1.LogLevel.Info, `Delayed reduced brightness on ${this.info.customName}`);
+                    services_1.Utils.guardedTimeout(() => {
+                        this.log(models_1.LogLevel.Info, `Delayed reduced brightness on ${this.info.customName}`);
                         this.setState(this.brightnessID, brightness);
                     }, 1000, this);
                 });
@@ -110,9 +108,9 @@ class ZigbeeIlluDimmer extends zigbeeDevice_1.ZigbeeDevice {
         if (timeout < 0 || !pValue) {
             return;
         }
-        this.turnOffTime = utils_1.Utils.nowMS() + timeout;
-        this._turnOffTimeout = utils_1.Utils.guardedTimeout(() => {
-            this.log(logLevel_1.LogLevel.Debug, `Delayed Turnoff initiated`);
+        this.turnOffTime = services_1.Utils.nowMS() + timeout;
+        this._turnOffTimeout = services_1.Utils.guardedTimeout(() => {
+            this.log(models_1.LogLevel.Debug, `Delayed Turnoff initiated`);
             this._turnOffTimeout = undefined;
             if (!this.room) {
                 this.setLight(false, -1, true);
@@ -127,7 +125,7 @@ class ZigbeeIlluDimmer extends zigbeeDevice_1.ZigbeeDevice {
         const newVal = this.queuedValue !== null ? !this.queuedValue : !this.lightOn;
         const timeout = newVal && force ? 30 * 60 * 1000 : -1;
         if (newVal && time === undefined && calculateTime && this.room !== undefined) {
-            time = time_callback_service_1.TimeCallbackService.dayType((_a = this.room) === null || _a === void 0 ? void 0 : _a.settings.lampOffset);
+            time = services_1.TimeCallbackService.dayType((_a = this.room) === null || _a === void 0 ? void 0 : _a.settings.lampOffset);
         }
         if (newVal && time !== undefined) {
             this.setTimeBased(time, timeout, force);

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

@@ -1,11 +1,11 @@
 /// <reference types="iobroker" />
 import { DeviceInfo } from '../DeviceInfo';
 import { ZigbeeIlluActuator } from './zigbeeIlluActuator';
+import { TimeOfDay } from '../../../models';
 import { iLamp } from '../iLamp';
-import { TimeOfDay } from '../../services';
 export declare class ZigbeeIlluLampe extends ZigbeeIlluActuator implements iLamp {
-    get lightOn(): boolean;
     constructor(pInfo: DeviceInfo);
+    get lightOn(): boolean;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     /** @inheritdoc */
     setLight(pValue: boolean, timeout?: number, force?: boolean): void;

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

@@ -5,14 +5,13 @@ const deviceType_1 = require("../deviceType");
 const zigbeeIlluActuator_1 = require("./zigbeeIlluActuator");
 const models_1 = require("../../../models");
 const services_1 = require("../../services");
-const services_2 = require("../../services");
 class ZigbeeIlluLampe extends zigbeeIlluActuator_1.ZigbeeIlluActuator {
-    get lightOn() {
-        return super.actuatorOn;
-    }
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeIlluLampe);
     }
+    get lightOn() {
+        return super.actuatorOn;
+    }
     update(idSplit, state, initial = false) {
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
@@ -26,7 +25,7 @@ class ZigbeeIlluLampe extends zigbeeIlluActuator_1.ZigbeeIlluActuator {
         this.log(models_1.LogLevel.Debug, `Lampenaktor schalten Wert: ${pValue}`);
         if (this.settings.isStromStoss) {
             timeout = 3000;
-            services_2.Utils.guardedTimeout(() => {
+            services_1.Utils.guardedTimeout(() => {
                 var _a;
                 if (this.room && ((_a = this.room.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.anyPresent())) {
                     this.setLight(true, -1, true);
@@ -50,9 +49,9 @@ class ZigbeeIlluLampe extends zigbeeIlluActuator_1.ZigbeeIlluActuator {
         return newVal;
     }
     setTimeBased(time, timeout = -1, force = false) {
-        if ((time === services_1.TimeOfDay.Night && this.settings.nightOn) ||
-            (time === services_1.TimeOfDay.BeforeSunrise && this.settings.dawnOn) ||
-            (time === services_1.TimeOfDay.AfterSunset && this.settings.duskOn)) {
+        if ((time === models_1.TimeOfDay.Night && this.settings.nightOn) ||
+            (time === models_1.TimeOfDay.BeforeSunrise && this.settings.dawnOn) ||
+            (time === models_1.TimeOfDay.AfterSunset && this.settings.duskOn)) {
             this.setLight(true, timeout, force);
         }
     }

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

@@ -1,8 +1,7 @@
 /// <reference types="iobroker" />
 import { DeviceInfo } from '../DeviceInfo';
-import { LedSettings } from '../../../models/deviceSettings/ledSettings';
+import { LedSettings, TimeOfDay } from '../../../models';
 import { ZigbeeDevice } from './zigbeeDevice';
-import { TimeOfDay } from '../../services/time-callback-service';
 export declare class ZigbeeIlluLedRGBCCT extends ZigbeeDevice {
     static DEFAULT_COLOR_WARM: string;
     on: boolean;

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

@@ -2,10 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeIlluLedRGBCCT = void 0;
 const deviceType_1 = require("../deviceType");
-const ledSettings_1 = require("../../../models/deviceSettings/ledSettings");
+const models_1 = require("../../../models");
 const zigbeeDevice_1 = require("./zigbeeDevice");
-const logLevel_1 = require("../../../models/logLevel");
-const time_callback_service_1 = require("../../services/time-callback-service");
 class ZigbeeIlluLedRGBCCT extends zigbeeDevice_1.ZigbeeDevice {
     // private effectID: string = '';
     constructor(pInfo) {
@@ -14,7 +12,7 @@ class ZigbeeIlluLedRGBCCT extends zigbeeDevice_1.ZigbeeDevice {
         this.brightness = 0;
         this.color = '#fcba32';
         this.colortemp = 500;
-        this.settings = new ledSettings_1.LedSettings();
+        this.settings = new models_1.LedSettings();
         this.stateID = 'state';
         this.brightnessID = 'brightness';
         this.colorID = '';
@@ -26,45 +24,45 @@ class ZigbeeIlluLedRGBCCT extends zigbeeDevice_1.ZigbeeDevice {
         // this.effectID = `${this.info.fullID}.effect`;
     }
     update(idSplit, state, initial = false) {
-        this.log(logLevel_1.LogLevel.DeepTrace, `LED Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        this.log(models_1.LogLevel.DeepTrace, `LED Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case 'state':
-                this.log(logLevel_1.LogLevel.Trace, `LED Update für ${this.info.customName} auf ${state.val}`);
+                this.log(models_1.LogLevel.Trace, `LED Update für ${this.info.customName} auf ${state.val}`);
                 this.on = state.val;
                 break;
             case 'brightness':
-                this.log(logLevel_1.LogLevel.Trace, `LED Helligkeit Update für ${this.info.customName} auf ${state.val}`);
+                this.log(models_1.LogLevel.Trace, `LED Helligkeit Update für ${this.info.customName} auf ${state.val}`);
                 this.brightness = state.val;
                 break;
             case 'color':
-                this.log(logLevel_1.LogLevel.Trace, `LED Color Update für ${this.info.customName} auf ${state.val}`);
+                this.log(models_1.LogLevel.Trace, `LED Color Update für ${this.info.customName} auf ${state.val}`);
                 this.color = state.val;
                 break;
             case 'colortemp':
-                this.log(logLevel_1.LogLevel.Trace, `LED Color Update für ${this.info.customName} auf ${state.val}`);
+                this.log(models_1.LogLevel.Trace, `LED Color Update für ${this.info.customName} auf ${state.val}`);
                 this.colortemp = state.val;
                 break;
         }
     }
     setTimeBased(time) {
         switch (time) {
-            case time_callback_service_1.TimeOfDay.Night:
+            case models_1.TimeOfDay.Night:
                 if (this.settings.nightOn) {
                     this.setLight(true, this.settings.nightBrightness, this.settings.nightColor, this.settings.nightColorTemp);
                 }
                 break;
-            case time_callback_service_1.TimeOfDay.AfterSunset:
+            case models_1.TimeOfDay.AfterSunset:
                 if (this.settings.duskOn) {
                     this.setLight(true, this.settings.duskBrightness, this.settings.duskColor, this.settings.duskColorTemp);
                 }
                 break;
-            case time_callback_service_1.TimeOfDay.BeforeSunrise:
+            case models_1.TimeOfDay.BeforeSunrise:
                 if (this.settings.dawnOn) {
                     this.setLight(true, this.settings.dawnBrightness, this.settings.dawnColor, this.settings.dawnColorTemp);
                 }
                 break;
-            case time_callback_service_1.TimeOfDay.Daylight:
+            case models_1.TimeOfDay.Daylight:
                 if (this.settings.dayOn) {
                     this.setLight(true, this.settings.dayBrightness, this.settings.dayColor, this.settings.dayColorTemp);
                 }
@@ -73,40 +71,40 @@ class ZigbeeIlluLedRGBCCT extends zigbeeDevice_1.ZigbeeDevice {
     }
     setLight(pValue, brightness = -1, color = '', colortemp = -1) {
         if (this.stateID === '') {
-            this.log(logLevel_1.LogLevel.Error, `Keine State ID bekannt.`);
+            this.log(models_1.LogLevel.Error, `Keine State ID bekannt.`);
             return;
         }
         if (!this.ioConn) {
-            this.log(logLevel_1.LogLevel.Error, `Keine Connection bekannt.`);
+            this.log(models_1.LogLevel.Error, `Keine Connection bekannt.`);
             return;
         }
         if (pValue && brightness === -1 && this.brightness < 10) {
             brightness = 10;
         }
-        this.log(logLevel_1.LogLevel.Debug, `LED Schalten An: ${pValue}\tHelligkeit: ${brightness}%\tFarbe: "${color}"\tColorTemperatur: ${colortemp}`);
+        this.log(models_1.LogLevel.Debug, `LED Schalten An: ${pValue}\tHelligkeit: ${brightness}%\tFarbe: "${color}"\tColorTemperatur: ${colortemp}`);
         if (color !== '') {
             this.ioConn.setState(this.colorID, color, (err) => {
                 if (err) {
-                    this.log(logLevel_1.LogLevel.Error, `LED Farbe schalten ergab Fehler: ${err}`);
+                    this.log(models_1.LogLevel.Error, `LED Farbe schalten ergab Fehler: ${err}`);
                 }
             });
         }
         if (colortemp > -1) {
             this.ioConn.setState(this.colorTempID, colortemp, (err) => {
                 if (err) {
-                    this.log(logLevel_1.LogLevel.Error, `LED Farbwärme schalten ergab Fehler: ${err}`);
+                    this.log(models_1.LogLevel.Error, `LED Farbwärme schalten ergab Fehler: ${err}`);
                 }
             });
         }
         this.ioConn.setState(this.stateID, pValue, (err) => {
             if (err) {
-                this.log(logLevel_1.LogLevel.Error, `LED schalten ergab Fehler: ${err}`);
+                this.log(models_1.LogLevel.Error, `LED schalten ergab Fehler: ${err}`);
             }
         });
         if (brightness > -1) {
             this.ioConn.setState(this.brightnessID, brightness, (err) => {
                 if (err) {
-                    this.log(logLevel_1.LogLevel.Error, `LED Helligkeit schalten ergab Fehler: ${err}`);
+                    this.log(models_1.LogLevel.Error, `LED Helligkeit schalten ergab Fehler: ${err}`);
                 }
             });
         }

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

@@ -5,8 +5,6 @@ export declare class ZigbeeIlluShutter extends ZigbeeShutter {
     private _movementStateId;
     private _movementState;
     private _movementStartMs;
-    private _msTilTop;
-    private _msTilBot;
     private _movementStartPos;
     private _iMovementTimeout;
     constructor(pInfo: DeviceInfo);

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeIlluShutter = void 0;
 const zigbeeShutter_1 = require("./zigbeeShutter");
 const deviceType_1 = require("../deviceType");
-const logLevel_1 = require("../../../models/logLevel");
-const utils_1 = require("../../services/utils/utils");
+const models_1 = require("../../../models");
+const services_1 = require("../../services");
 var MovementState;
 (function (MovementState) {
     MovementState[MovementState["Down"] = 30] = "Down";
@@ -16,8 +16,6 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
         super(pInfo, deviceType_1.DeviceType.ZigbeeIlluShutter);
         this._movementState = MovementState.Stop;
         this._movementStartMs = -1;
-        this._msTilTop = -1;
-        this._msTilBot = -1;
         this._movementStartPos = -1;
         this._movementStateId = `${this.info.fullID}.position`;
         // this.presenceStateID = `${this.info.fullID}.1.${HmIpPraezenz.PRESENCE_DETECTION}`;
@@ -25,7 +23,7 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
     update(idSplit, state, initial = false) {
         switch (idSplit[3]) {
             case 'position':
-                this.log(logLevel_1.LogLevel.Trace, `Shutter Update for ${this.info.customName} to "${state.val}"`);
+                this.log(models_1.LogLevel.Trace, `Shutter Update for ${this.info.customName} to "${state.val}"`);
                 this.processNewMovementState(state.val);
                 break;
         }
@@ -33,12 +31,12 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
     }
     moveToPosition(targetPosition) {
         if (this._movementState !== MovementState.Stop) {
-            this.log(logLevel_1.LogLevel.Info, `Delaying movement command for ${this.info.customName} as it is moving to prevent actuator damage`);
+            this.log(models_1.LogLevel.Info, `Delaying movement command for ${this.info.customName} as it is moving to prevent actuator damage`);
             this.changeMovementState(MovementState.Stop);
             if (this._iMovementTimeout !== undefined) {
                 clearTimeout(this._iMovementTimeout);
             }
-            this._iMovementTimeout = utils_1.Utils.guardedTimeout(() => {
+            this._iMovementTimeout = services_1.Utils.guardedTimeout(() => {
                 this._iMovementTimeout = undefined;
                 this.moveToPosition(targetPosition);
             }, 2000, this);
@@ -47,28 +45,34 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
         this._movementStartPos = this._currentLevel;
         if (targetPosition === 100) {
             this.changeMovementState(MovementState.Up);
+            this.initializeMovementFinishTimeout(this.getAverageUp(), 100);
             return;
         }
         if (targetPosition === 0) {
             this.changeMovementState(MovementState.Down);
+            this.initializeMovementFinishTimeout(this.getAverageUp(), 0);
+            services_1.Utils.guardedTimeout(() => {
+                this.changeMovementState(MovementState.Stop);
+            }, this.getAverageDown() + 1000, this);
             return;
         }
         if (!this.isCalibrated()) {
-            this.log(logLevel_1.LogLevel.Alert, `Can't move  to position "${targetPosition}" as it is not calibrated (Move it completly up, down, up first)`);
+            this.log(models_1.LogLevel.Alert, `Can't move  to position "${targetPosition}" as it is not calibrated (Move it completly up, down, up first)`);
             return;
         }
         const distance = Math.abs(this._currentLevel - targetPosition);
         const direction = this._currentLevel > targetPosition ? MovementState.Down : MovementState.Up;
-        const duration = Math.round(distance / 100) * (this._currentLevel > targetPosition ? this._msTilBot : this._msTilTop);
+        const duration = Math.round(distance / 100) * (this._currentLevel > targetPosition ? this.getAverageDown() : this.getAverageUp());
         this.changeMovementState(direction);
-        utils_1.Utils.guardedTimeout(() => {
+        this.initializeMovementFinishTimeout(duration, targetPosition);
+        services_1.Utils.guardedTimeout(() => {
             this.changeMovementState(MovementState.Stop);
         }, duration, this);
     }
     changeMovementState(direction) {
-        this.log(logLevel_1.LogLevel.Debug, `Set new MovementState to "${MovementState[direction]}"`);
+        this.log(models_1.LogLevel.Debug, `Set new MovementState to "${MovementState[direction]}"`);
         if (direction !== MovementState.Stop) {
-            this._movementStartMs = utils_1.Utils.nowMS();
+            this._movementStartMs = services_1.Utils.nowMS();
         }
         this.setState(this._movementStateId, direction, () => {
             this._movementState = direction;
@@ -76,43 +80,41 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
     }
     processNewMovementState(val) {
         const newState = val <= 30 ? MovementState.Down : val >= 70 ? MovementState.Up : MovementState.Stop;
-        this.log(logLevel_1.LogLevel.Trace, `New Movementstate "${MovementState[val]}"`);
+        this.log(models_1.LogLevel.Trace, `New Movementstate "${MovementState[val]}"`);
         if (newState !== MovementState.Stop) {
             this._movementState = newState;
             return;
         }
-        const timePassed = utils_1.Utils.nowMS() - this._movementStartMs;
+        const timePassed = services_1.Utils.nowMS() - this._movementStartMs;
         const oldState = this._movementState;
         if (this._movementStartPos === 0 && oldState === MovementState.Up && this._setLevel === 100) {
-            this._msTilTop = timePassed;
-            this.log(logLevel_1.LogLevel.Debug, `New Time-Until-Top measurement for ${this.info.customName}: ${timePassed}ms`);
+            this.log(models_1.LogLevel.Debug, `New Time-Until-Top measurement for ${this.info.customName}: ${timePassed}ms`);
             this.currentLevel = this._setLevel;
             this._shutterCalibrationData.counterUp++;
             this._shutterCalibrationData.averageUp +=
-                (this._msTilTop - this._shutterCalibrationData.averageUp) / this._shutterCalibrationData.counterUp;
+                (timePassed - this._shutterCalibrationData.averageUp) / this._shutterCalibrationData.counterUp;
             this.persistCalibrationData();
-            this.log(logLevel_1.LogLevel.Trace, `New Measurment for shutter up (${this._msTilTop}ms), new Average: ${this._shutterCalibrationData.averageUp}`);
+            this.log(models_1.LogLevel.Trace, `New Measurment for shutter up (${this.getAverageUp()}ms), new Average: ${this._shutterCalibrationData.averageUp}`);
             return;
         }
         if (this._movementStartPos === 100 && oldState === MovementState.Down && this._setLevel === 0) {
-            this.log(logLevel_1.LogLevel.Debug, `New Time-Until-Bottom measurement for ${this.info.customName}: ${timePassed}ms`);
-            this._msTilBot = timePassed;
+            this.log(models_1.LogLevel.Debug, `New Time-Until-Bottom measurement for ${this.info.customName}: ${timePassed}ms`);
             this.currentLevel = this._setLevel;
             this._shutterCalibrationData.counterDown++;
             this._shutterCalibrationData.averageDown +=
-                (this._msTilBot - this._shutterCalibrationData.averageDown) / this._shutterCalibrationData.counterDown;
+                (timePassed - this._shutterCalibrationData.averageDown) / this._shutterCalibrationData.counterDown;
             this.persistCalibrationData();
-            this.log(logLevel_1.LogLevel.Trace, `New Measurment for shutter down (${this._msTilBot}ms), new Average: ${this._shutterCalibrationData.averageDown}`);
+            this.log(models_1.LogLevel.Trace, `New Measurment for shutter down (${this.getAverageDown()}ms), new Average: ${this._shutterCalibrationData.averageDown}`);
             return;
         }
         if (!this.isCalibrated()) {
             return;
         }
         if (oldState === MovementState.Down) {
-            this.currentLevel = Math.min(this._currentLevel - Math.round((timePassed * 100) / this._msTilBot), 0);
+            this.currentLevel = Math.min(this._currentLevel - Math.round((timePassed * 100) / this.getAverageDown()), 0);
         }
         else if (oldState === MovementState.Up) {
-            this.currentLevel = Math.max(this._currentLevel + Math.round((timePassed * 100) / this._msTilBot), 100);
+            this.currentLevel = Math.max(this._currentLevel + Math.round((timePassed * 100) / this.getAverageUp()), 100);
         }
     }
 }