hoffmation-base 0.1.29-8 → 0.1.30-3

package/README.md

@@ -20,6 +20,7 @@ Whether you use it with Hoffmation-Express or with your own controller code, mak
 ### Base requirements
 In order to get the library running correctly, the following requirements should be met:
 * You use ioBroker for all devices that you want to control or read from
+  Make sure you got the [socket.io](https://github.com/ioBroker/ioBroker.socketio) adapter installed
 * You use devices that are supported or are able to use one of the supported devices as base for yours.  
   (If you use a Zigbee or Homematic IP device that is not currently supported, don't hesitate to create a pull request and add it!)
 * You have a unix-based or windows device for the software you want to run this library with.

package/lib/index.js

@@ -25,10 +25,17 @@ exports.HoffmationInitializationObject = HoffmationInitializationObject;
 class HoffmationBase {
     static async initializeBeforeIoBroker(initObject) {
         server_1.SettingsService.initialize(initObject.config);
+        server_1.Res.initialize(initObject.config.translationSettings);
+        if (initObject.config.logSettings) {
+            server_1.ServerLogService.initialize(initObject.config.logSettings);
+        }
         server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Hoffmation-Base Startup`);
         if (initObject.config.persistence) {
             await server_1.Persist.initialize(initObject.config.persistence);
         }
+        else {
+            server_1.Persist.turnOff();
+        }
         this._app = initObject.app;
         if (server_1.SettingsService.settings.mp3Server) {
             server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Mp3Server settings detected --> initializing`);

package/lib/models/dimmerSettings.d.ts

@@ -1,5 +1,7 @@
-export declare class DimmerSettings {
-    dawnOn: boolean;
-    duskOn: boolean;
-    nightOn: boolean;
+import { ActuatorSettings } from './actuatorSettings';
+export declare class DimmerSettings extends ActuatorSettings {
+    nightBrightness: number;
+    dawnBrightness: number;
+    duskBrightness: number;
+    dayBrightness: number;
 }

package/lib/models/dimmerSettings.js

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DimmerSettings = void 0;
-class DimmerSettings {
+const actuatorSettings_1 = require("./actuatorSettings");
+class DimmerSettings extends actuatorSettings_1.ActuatorSettings {
     constructor() {
-        this.dawnOn = true;
-        this.duskOn = true;
-        this.nightOn = true;
+        super(...arguments);
+        this.nightBrightness = 50;
+        this.dawnBrightness = 75;
+        this.duskBrightness = 75;
+        this.dayBrightness = 100;
     }
 }
 exports.DimmerSettings = DimmerSettings;

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

@@ -0,0 +1,8 @@
+export declare class ShutterCalibration {
+    deviceID: string;
+    averageUp: number;
+    counterUp: number;
+    averageDown: number;
+    counterDown: number;
+    constructor(deviceID: string, averageUp: number, counterUp: number, averageDown: number, counterDown: number);
+}

package/lib/models/persistence/ShutterCalibration.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ShutterCalibration = void 0;
+class ShutterCalibration {
+    constructor(deviceID, averageUp, counterUp, averageDown, counterDown) {
+        this.deviceID = deviceID;
+        this.averageUp = averageUp;
+        this.counterUp = counterUp;
+        this.averageDown = averageDown;
+        this.counterDown = counterDown;
+    }
+}
+exports.ShutterCalibration = ShutterCalibration;

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

@@ -1,6 +1,7 @@
-export * from './todaysCount';
 export * from './BasicRoomInfo';
-export * from './RoomDetailInfo';
+export * from './CurrentIlluminationDataPoint';
 export * from './DailyMovementCount';
+export * from './RoomDetailInfo';
+export * from './ShutterCalibration';
 export * from './temperaturDataPoint';
-export * from './CurrentIlluminationDataPoint';
+export * from './todaysCount';

package/lib/models/persistence/index.js

@@ -10,9 +10,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./todaysCount"), exports);
 __exportStar(require("./BasicRoomInfo"), exports);
-__exportStar(require("./RoomDetailInfo"), exports);
+__exportStar(require("./CurrentIlluminationDataPoint"), exports);
 __exportStar(require("./DailyMovementCount"), exports);
+__exportStar(require("./RoomDetailInfo"), exports);
+__exportStar(require("./ShutterCalibration"), exports);
 __exportStar(require("./temperaturDataPoint"), exports);
-__exportStar(require("./CurrentIlluminationDataPoint"), exports);
+__exportStar(require("./todaysCount"), exports);

package/lib/models/rooms/RoomBase.js

@@ -17,6 +17,7 @@ const persist_1 = require("../../server/services/dbo/persist");
 const time_callback_service_1 = require("../../server/services/time-callback-service");
 const sonos_service_1 = require("../../server/services/Sonos/sonos-service");
 const sonosGroup_1 = require("../../server/devices/groups/sonosGroup");
+const res_1 = require("../../server/services/Translation/res");
 class RoomBase {
     constructor(roomName, Einstellungen) {
         this.roomName = roomName;
@@ -88,7 +89,7 @@ class RoomBase {
         this.restoreLight();
     }
     static startAwayMode() {
-        sonos_service_1.SonosService.speakOnAll(`Alarmanlage wird scharfgeschaltet.`, 40);
+        sonos_service_1.SonosService.speakOnAll(res_1.Res.alarmArmed(), 40);
         if (this._awayModeTimer) {
             clearTimeout(this._awayModeTimer);
         }
@@ -99,7 +100,7 @@ class RoomBase {
         }, 60000, this);
     }
     static startNightAlarmMode() {
-        sonos_service_1.SonosService.speakOnAll(`Alarmanlage wird für die Nacht scharfgeschaltet. Gute Nacht!`, 30);
+        sonos_service_1.SonosService.speakOnAll(res_1.Res.alarmNightModeArmed(), 30);
         if (this._nightModeTimer) {
             clearTimeout(this._nightModeTimer);
         }
@@ -128,11 +129,11 @@ class RoomBase {
     static endAlarmModes() {
         if (this.awayModeActive) {
             telegram_service_1.TelegramService.sendMessage(telegram_service_1.TelegramService.subscribedIDs, `Alarmanalage entschärft`);
-            sonos_service_1.SonosService.speakOnAll(`Willkommen Zuhause!`, 35);
+            sonos_service_1.SonosService.speakOnAll(res_1.Res.welcomeHome(), 35);
         }
         if (this.nightAlarmActive) {
             telegram_service_1.TelegramService.sendMessage(telegram_service_1.TelegramService.subscribedIDs, `Nachtmodus der Alarmanlage entschärft`);
-            sonos_service_1.SonosService.speakOnAll(`Guten Morgen!`, 30);
+            sonos_service_1.SonosService.speakOnAll(res_1.Res.goodMorning(), 30);
         }
         if (this._nightModeTimer) {
             clearTimeout(this._nightModeTimer);
@@ -240,11 +241,11 @@ class RoomBase {
         let newTimeout = 20000;
         const alarmAutomaticEnd = 15;
         if (this._intrusionAlarmLevel === 1) {
-            speakMessage = `Hallo potenzieller Eindringling! Das Alarmprotokoll ist initiiert bitte verlassen Sie umgehend das Gebäude!`;
+            speakMessage = res_1.Res.intruderGreeting();
             volume = 40;
         }
         else if (this._intrusionAlarmLevel === 2) {
-            speakMessage = `Alle Rollos fahren hoch, bitte begeben Sie sich zum nächsten Ausgang`;
+            speakMessage = res_1.Res.intruderShutterUpPleaseLeave();
             utils_1.Utils.guardedNewThread(() => {
                 this.setAllRolloOfFloor(-1, 100);
                 this.setAllLampsOfFloor(-1, true);
@@ -252,11 +253,11 @@ class RoomBase {
         }
         else if (this._intrusionAlarmLevel === 3) {
             volume = 70;
-            speakMessage = `Verlassen Sie sofort das Gebäude! Die Behörden sind informiert`;
+            speakMessage = res_1.Res.intruderLeaveAndOwnerInformed();
         }
         else if (this._intrusionAlarmLevel <= 5) {
             volume = 80;
-            speakMessage = `Weitere Abwehrmaßnahmen werden eingeleitet`;
+            speakMessage = res_1.Res.intruderAdditionalDefenseWarning();
         }
         else if (this._intrusionAlarmLevel >= alarmAutomaticEnd) {
             this.stopIntrusionAlarm();
@@ -264,7 +265,7 @@ class RoomBase {
         }
         else {
             volume = 90;
-            speakMessage = `Alarm. Einbrecher erkannt.`;
+            speakMessage = res_1.Res.intruderAlarm();
             newTimeout = 10000;
         }
         this._intrusionAlarmTimeout = utils_1.Utils.guardedTimeout(() => {

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

@@ -6,6 +6,8 @@ interface iSonosSettings {
 export interface iConfig {
     expressPort?: number;
     ioBrokerUrl: string;
+    logSettings?: iLogSettings;
+    translationSettings: iTranslationSettings;
     mp3Server?: iMp3Settings;
     muell?: iMuellSettings;
     persistence?: iPersistenceSettings;
@@ -16,6 +18,10 @@ export interface iConfig {
     timeSettings: iTimeSettings;
     weather?: iWeatherSettings;
 }
+export interface iLogSettings {
+    logLevel: number;
+    useTimestamp: boolean;
+}
 export interface iTimePair {
     hours: number;
     minutes: number;
@@ -54,4 +60,7 @@ export interface iWeatherSettings {
 export interface iMuellSettings {
     calendarURL: string;
 }
+export interface iTranslationSettings {
+    language: string;
+}
 export {};

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

@@ -9,6 +9,7 @@ const MagnetPosition_1 = require("../models/MagnetPosition");
 const telegram_service_1 = require("../../services/Telegram/telegram-service");
 const logLevel_1 = require("../../../models/logLevel");
 const sonos_service_1 = require("../../services/Sonos/sonos-service");
+const res_1 = require("../../services/Translation/res");
 class HmIpTuer extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpTuer);
@@ -66,7 +67,7 @@ class HmIpTuer extends hmIpDevice_1.HmIPDevice {
             return;
         }
         else if (this._iOpen === undefined) {
-            const message = `"${this.info.customName}" was opened`;
+            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);

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

@@ -23,7 +23,11 @@ export declare class ZigbeeAquaraMotion extends ZigbeeDevice implements iIllumin
     get detectionsToday(): number;
     set detectionsToday(pVal: number);
     constructor(pInfo: DeviceInfo);
-    addMovementCallback(pCallback: (pValue: boolean) => void): void;
+    /**
+     * 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;

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

@@ -25,11 +25,11 @@ class ZigbeeAquaraMotion extends zigbeeDevice_1.ZigbeeDevice {
         persist_1.Persist.getCount(this)
             .then((todayCount) => {
             this.detectionsToday = todayCount.counter;
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Bewegungscounter "${this.info.customName}" vorinitialisiert mit ${this.detectionsToday}`);
+            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}`);
+            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
@@ -53,7 +53,7 @@ class ZigbeeAquaraMotion extends zigbeeDevice_1.ZigbeeDevice {
         this.setState(this.occupancyTimeoutID, value, () => {
             this._motionTimeout = value;
         }, (err) => {
-            console.log(`Error occured while setting motion timeout: ${err}`);
+            console.log(`Error occurred while setting motion timeout: ${err}`);
         });
     }
     get detectionsToday() {
@@ -64,19 +64,23 @@ class ZigbeeAquaraMotion extends zigbeeDevice_1.ZigbeeDevice {
         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, `Bewegung für "${this.info.customName}" erkannt aber die Initialisierung aus der DB ist noch nicht erfolgt --> verzögern`);
+            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, `Überspringe Bewegung für "${this.info.customName}" da bereits der Wert ${newState} vorliegt`);
+            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();
@@ -86,18 +90,18 @@ class ZigbeeAquaraMotion extends zigbeeDevice_1.ZigbeeDevice {
         }
         this.resetFallbackTimeout();
         this.movementDetected = newState;
-        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `Neuer Bewegunsstatus Wert für "${this.info.customName}": ${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, `Dies ist die ${this.detectionsToday} Bewegung für "${this.info.customName}"`);
+            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, `Stecker Update für "${this.info.customName}": ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        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':
@@ -108,13 +112,13 @@ class ZigbeeAquaraMotion extends zigbeeDevice_1.ZigbeeDevice {
                 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 'illumincance':
+            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;
                 break;
             case 'occupancy_timeout':
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Motion sensor: Update for motion timeout of ${this.info.customName}: ${state.val}`);
-                this._illuminance = state.val;
+                this._motionTimeout = state.val;
                 break;
         }
     }

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

@@ -8,6 +8,7 @@ const polly_service_1 = require("../../services/Sonos/polly-service");
 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) {
@@ -24,7 +25,7 @@ class ZigbeeAquaraVibra extends zigbeeDevice_1.ZigbeeDevice {
         this.vibrationBlockedTimeStamp = 0;
         this._idSensitivity = '';
         this._vibrationBlocked = false;
-        this._alarmMessage = `Alarm bei ${this.info.customName}. Ich wiederhole: Alarm bei ${this.info.customName}`;
+        this._alarmMessage = res_1.Res.vibrationAlarm(this.info.customName);
         polly_service_1.PollyService.preloadTTS(this._alarmMessage);
         this._idSensitivity = `${this.info.fullID}.sensitivity`;
     }

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

@@ -8,6 +8,7 @@ const polly_service_1 = require("../../services/Sonos/polly-service");
 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 ZigbeeAquaraWater extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraWater);
@@ -17,15 +18,15 @@ class ZigbeeAquaraWater extends zigbeeDevice_1.ZigbeeDevice {
         this._messageAlarmFirst = '';
         this._messageAlarm = '';
         this._messageAlarmEnd = '';
-        this._messageAlarmFirst = `${this.info.customName} erkennt Wasser. Möglicher Rohrbruch in ${this._roomName}`;
-        this._messageAlarm = `${this.info.customName} hat ausgelöst. Poolparty in ${this._roomName}`;
-        this._messageAlarmEnd = `Wasser Alarm Ende: Überflutung in ${this._roomName} zu Ende.`;
+        this._messageAlarmFirst = res_1.Res.waterAlarmStart(this.info.customName, this._roomName);
+        this._messageAlarm = res_1.Res.waterAlarmRepeat(this.info.customName, this._roomName);
+        this._messageAlarmEnd = res_1.Res.waterAlarmEnd(this._roomName);
     }
     set roomName(val) {
         this._roomName = val;
-        this._messageAlarmFirst = `${this.info.customName} erkennt Wasser. Möglicher Rohrbruch in ${this._roomName}`;
-        this._messageAlarm = `${this.info.customName} hat ausgelöst. Poolparty in ${this._roomName}`;
-        this._messageAlarmEnd = `Wasser Alarm Ende: Überflutung in ${this._roomName} zu Ende.`;
+        this._messageAlarmFirst = res_1.Res.waterAlarmStart(this.info.customName, this._roomName);
+        this._messageAlarm = res_1.Res.waterAlarmRepeat(this.info.customName, this._roomName);
+        this._messageAlarmEnd = res_1.Res.waterAlarmEnd(this._roomName);
         polly_service_1.PollyService.preloadTTS(this._messageAlarmFirst);
         polly_service_1.PollyService.preloadTTS(this._messageAlarm);
         polly_service_1.PollyService.preloadTTS(this._messageAlarmEnd);

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

@@ -9,6 +9,7 @@ const polly_service_1 = require("../../services/Sonos/polly-service");
 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 ZigbeeHeimanSmoke extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeHeimanSmoke);
@@ -18,15 +19,15 @@ class ZigbeeHeimanSmoke extends zigbeeDevice_1.ZigbeeDevice {
         this._messageAlarmFirst = '';
         this._messageAlarm = '';
         this._messageAlarmEnd = '';
-        this._messageAlarmFirst = `Rauchmelder in ${this._roomName} ausgelöst. Möglicher Brand in ${this._roomName}`;
-        this._messageAlarm = `Rauchmelder in ${this._roomName} aktiv. Möglicher Brand in ${this._roomName}`;
-        this._messageAlarmEnd = `Rauchmelder Alarm Ende: Gefahr in ${this._roomName} zu Ende.`;
+        this._messageAlarmFirst = res_1.Res.fireAlarmStart(this._roomName, this.info.customName);
+        this._messageAlarm = res_1.Res.fireAlarmRepeat(this._roomName, this.info.customName);
+        this._messageAlarmEnd = res_1.Res.fireAlarmEnd(this._roomName);
     }
     set roomName(val) {
         this._roomName = val;
-        this._messageAlarmFirst = `Rauchmelder in ${this._roomName} ausgelöst. Möglicher Brand in ${this._roomName}`;
-        this._messageAlarm = `Rauchmelder in ${this._roomName} aktiv. Möglicher Brand in ${this._roomName}`;
-        this._messageAlarmEnd = `Rauchmelder Alarm Ende: Gefahr in ${this._roomName} zu Ende.`;
+        this._messageAlarmFirst = res_1.Res.fireAlarmStart(this._roomName, this.info.customName);
+        this._messageAlarm = res_1.Res.fireAlarmRepeat(this._roomName, this.info.customName);
+        this._messageAlarmEnd = res_1.Res.fireAlarmEnd(this._roomName);
         polly_service_1.PollyService.preloadTTS(this._messageAlarmFirst);
         polly_service_1.PollyService.preloadTTS(this._messageAlarm);
         polly_service_1.PollyService.preloadTTS(this._messageAlarmEnd);

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

@@ -19,5 +19,5 @@ export declare class ZigbeeIlluDimmer extends ZigbeeDevice implements iLamp {
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     setTimeBased(time: TimeOfDay, timeout?: number, force?: boolean): void;
     setLight(pValue: boolean, timeout?: number, force?: boolean, brightness?: number, transitionTime?: number): void;
-    toggleLight(time?: TimeOfDay, force?: boolean): boolean;
+    toggleLight(time?: TimeOfDay, force?: boolean, calculateTime?: boolean): boolean;
 }

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

@@ -47,14 +47,16 @@ class ZigbeeIlluDimmer extends zigbeeDevice_1.ZigbeeDevice {
     setTimeBased(time, timeout = -1, force = false) {
         switch (time) {
             case time_callback_service_1.TimeOfDay.Night:
-                this.setLight(true, timeout, force, 50);
+                this.setLight(true, timeout, force, this.settings.nightBrightness);
                 break;
             case time_callback_service_1.TimeOfDay.AfterSunset:
+                this.setLight(true, timeout, force, this.settings.dawnBrightness);
+                break;
             case time_callback_service_1.TimeOfDay.BeforeSunrise:
-                this.setLight(true, timeout, force, 75);
+                this.setLight(true, timeout, force, this.settings.duskBrightness);
                 break;
             case time_callback_service_1.TimeOfDay.Daylight:
-                this.setLight(true, timeout, force, 100);
+                this.setLight(true, timeout, force, this.settings.dayBrightness);
                 break;
         }
     }
@@ -114,9 +116,13 @@ class ZigbeeIlluDimmer extends zigbeeDevice_1.ZigbeeDevice {
             }
         }, timeout, this);
     }
-    toggleLight(time, force = false) {
+    toggleLight(time, force = false, calculateTime = false) {
+        var _a;
         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.Einstellungen.lampOffset);
+        }
         if (newVal && time !== undefined) {
             this.setTimeBased(time, timeout, force);
             return true;

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

@@ -8,10 +8,12 @@ export declare class ZigbeeIlluShutter extends ZigbeeShutter {
     private _msTilTop;
     private _msTilBot;
     private _movementStartPos;
+    private _shutterCalibrationData;
     constructor(pInfo: DeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     protected moveToPosition(targetPosition: number): void;
     private changeMovementState;
     private processNewMovementState;
     private isCalibrated;
+    private persistCalibrationData;
 }

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

@@ -6,6 +6,8 @@ const deviceType_1 = require("../deviceType");
 const log_service_1 = require("../../services/log-service");
 const logLevel_1 = require("../../../models/logLevel");
 const utils_1 = require("../../services/utils/utils");
+const persist_1 = require("../../services/dbo/persist");
+const ShutterCalibration_1 = require("../../../models/persistence/ShutterCalibration");
 var MovementState;
 (function (MovementState) {
     MovementState[MovementState["Down"] = 30] = "Down";
@@ -20,7 +22,17 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
         this._msTilTop = -1;
         this._msTilBot = -1;
         this._movementStartPos = -1;
+        this._shutterCalibrationData = new ShutterCalibration_1.ShutterCalibration(this.info.fullID, 0, 0, 0, 0);
         this._movementStateId = `${this.info.fullID}.position`;
+        // this.presenceStateID = `${this.info.fullID}.1.${HmIpPraezenz.PRESENCE_DETECTION}`;
+        persist_1.Persist.getShutterCalibration(this)
+            .then((calibrationData) => {
+            this._shutterCalibrationData = calibrationData;
+            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.DeepTrace, `IlluShutter "${this.info.customName}" initialized with calibration data`);
+        })
+            .catch((err) => {
+            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `Failed to initialize Calibration data for "${this.info.customName}", err ${err.message}`);
+        });
     }
     update(idSplit, state, initial = false) {
         switch (idSplit[3]) {
@@ -74,12 +86,20 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
             this._msTilTop = timePassed;
             log_service_1.ServerLogService.writeLog(logLevel_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;
+            this.persistCalibrationData();
             return;
         }
         if (this._movementStartPos === 100 && oldState === MovementState.Down && this._setLevel === 0) {
             log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `New Time-Until-Bottom measurement for ${this.info.customName}: ${timePassed}ms`);
             this._msTilBot = timePassed;
             this.currentLevel = this._setLevel;
+            this._shutterCalibrationData.counterDown++;
+            this._shutterCalibrationData.averageDown +=
+                (this._msTilBot - this._shutterCalibrationData.averageDown) / this._shutterCalibrationData.counterDown;
+            this.persistCalibrationData();
             return;
         }
         if (!this.isCalibrated()) {
@@ -93,7 +113,10 @@ class ZigbeeIlluShutter extends zigbeeShutter_1.ZigbeeShutter {
         }
     }
     isCalibrated() {
-        return this._msTilTop > 0 && this._msTilBot > 0;
+        return this._shutterCalibrationData.averageUp > 0 && this._shutterCalibrationData.averageDown > 0;
+    }
+    persistCalibrationData() {
+        persist_1.Persist.persistShutterCalibration(this._shutterCalibrationData);
     }
 }
 exports.ZigbeeIlluShutter = ZigbeeIlluShutter;

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

@@ -8,6 +8,7 @@ const logLevel_1 = require("../../../models/logLevel");
 const sonos_service_1 = require("../../services/Sonos/sonos-service");
 const zigbeeDevice_1 = require("./zigbeeDevice");
 const MagnetPosition_1 = require("../models/MagnetPosition");
+const res_1 = require("../../services/Translation/res");
 class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, deviceType) {
         super(pInfo, deviceType);
@@ -40,9 +41,9 @@ class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
         if (pValue === MagnetPosition_1.MagnetPosition.closed) {
             if (this._iOpen !== undefined) {
                 clearInterval(this._iOpen);
-                let message = `${this.info.customName} closed after ${this.minutesOpen} minutes!`;
+                let message = res_1.Res.closedAfterMinutes(this.info.customName, this.minutesOpen.toString(10));
                 if (this.minutesOpen === 0) {
-                    message = `"${this.info.customName}" just closed`;
+                    message = res_1.Res.justClosed(this.info.customName);
                 }
                 // const message: string = `Die Tür mit dem Namen "${this.info.customName}" wurde nach ${this.minutesOpen} Minuten geschlossen!`;
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, message);
@@ -53,8 +54,7 @@ class ZigbeeMagnetContact extends zigbeeDevice_1.ZigbeeDevice {
             return;
         }
         else if (this._iOpen === undefined) {
-            const message = `"${this.info.customName}" was opened`;
-            //const message: string = `Die Tür mit dem Namen "${this.info.customName}" wurde geöfnet!`
+            const message = res_1.Res.wasOpened(this.info.customName);
             telegram_service_1.TelegramService.inform(message);
             sonos_service_1.SonosService.speakOnAll(message, 40);
             this._iOpen = utils_1.Utils.guardedInterval(() => {

package/lib/server/services/Sonos/sonos-service.js

@@ -100,8 +100,6 @@ class SonosService {
         }
         const specificTimeout = Math.ceil(duration / 1000) + 5;
         const options = {
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
             catchQueueErrors: true,
             trackUri: `${(_b = settings_service_1.SettingsService.settings.mp3Server) === null || _b === void 0 ? void 0 : _b.serverAddress}/file.mp3?fname=${mp3Name}`,
             delayMs: 750,

package/lib/server/services/Translation/iRessources.d.ts

@@ -0,0 +1,25 @@
+export interface IRessourceObject {
+    de?: string;
+    en: string;
+}
+export interface IRessources {
+    alarmArmed: IRessourceObject;
+    alarmNightModeArmed: IRessourceObject;
+    closedAfterMinutes: IRessourceObject;
+    fireAlarmEnd: IRessourceObject;
+    fireAlarmRepeat: IRessourceObject;
+    fireAlarmStart: IRessourceObject;
+    goodMorning: IRessourceObject;
+    intruderAlarm: IRessourceObject;
+    intruderAdditionalDefenseWarning: IRessourceObject;
+    intruderGreeting: IRessourceObject;
+    intruderLeaveAndOwnerInformed: IRessourceObject;
+    intruderShutterUpPleaseLeave: IRessourceObject;
+    justClosed: IRessourceObject;
+    vibrationAlarm: IRessourceObject;
+    waterAlarmEnd: IRessourceObject;
+    waterAlarmRepeat: IRessourceObject;
+    waterAlarmStart: IRessourceObject;
+    wasOpened: IRessourceObject;
+    welcomeHome: IRessourceObject;
+}

package/lib/server/services/Translation/iRessources.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -0,0 +1,2 @@
+export * from './iRessources';
+export * from './res';

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

@@ -0,0 +1,14 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./iRessources"), exports);
+__exportStar(require("./res"), exports);