hoffmation-base 0.1.41-1 → 0.1.41-13

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

@@ -1,22 +1,26 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
+import { MotionSensorSettings } from '../../../models';
 import { DeviceInfo } from '../DeviceInfo';
 import { iIlluminationSensor } from '../iIlluminationSensor';
-export declare class HmIpBewegung extends HmIPDevice implements iIlluminationSensor {
-    excludeFromNightAlarm: boolean;
-    movementDetected: boolean;
-    private _detectionsToday;
-    private _movementDetectedCallback;
+import { iMotionSensor } from '../iMotionSensor';
+export declare class HmIpBewegung extends HmIPDevice implements iIlluminationSensor, iMotionSensor {
     private static MOVEMENT_DETECTION;
     private static CURRENT_ILLUMINATION;
+    settings: MotionSensorSettings;
+    movementDetected: boolean;
+    private _movementDetectedCallback;
     private initialized;
     private _fallBackTimeout;
+    private _lastMotionTime;
+    constructor(pInfo: DeviceInfo);
+    get timeSinceLastMotion(): number;
+    private _detectionsToday;
+    get detectionsToday(): number;
+    set detectionsToday(pVal: number);
     private _currentIllumination;
     get currentIllumination(): number;
     private set currentIllumination(value);
-    get detectionsToday(): number;
-    set detectionsToday(pVal: number);
-    constructor(pInfo: DeviceInfo);
     addMovementCallback(pCallback: (pValue: boolean) => void): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     updateMovement(pVal: boolean): void;

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

@@ -3,49 +3,53 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpBewegung = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
-const utils_1 = require("../../services/utils/utils");
-const CurrentIlluminationDataPoint_1 = require("../../../models/persistence/CurrentIlluminationDataPoint");
-const logLevel_1 = require("../../../models/logLevel");
-const index_1 = require("../../../index");
+const models_1 = require("../../../models");
+const services_1 = require("../../services");
 class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
+        var _a;
         super(pInfo, deviceType_1.DeviceType.HmIpBewegung);
-        this.excludeFromNightAlarm = false;
+        this.settings = new models_1.MotionSensorSettings();
         this.movementDetected = false;
-        this._detectionsToday = 0;
         this._movementDetectedCallback = [];
         this.initialized = false;
+        this._lastMotionTime = 0;
+        this._detectionsToday = 0;
         this._currentIllumination = -1;
-        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.getCount(this).then((todayCount) => {
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.getCount(this).then((todayCount) => {
             this.detectionsToday = todayCount.counter;
-            this.log(logLevel_1.LogLevel.Debug, `Bewegungscounter vorinitialisiert mit ${this.detectionsToday}`);
+            this.log(models_1.LogLevel.Debug, `Bewegungscounter vorinitialisiert mit ${this.detectionsToday}`);
             this.initialized = true;
         }).catch((err) => {
             var _a;
-            this.log(logLevel_1.LogLevel.Warn, `Failed to initialize Movement Counter, err ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}`);
+            this.log(models_1.LogLevel.Warn, `Failed to initialize Movement Counter, err ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}`);
         });
     }
-    get currentIllumination() {
-        return this._currentIllumination;
-    }
-    set currentIllumination(value) {
-        var _a, _b, _c;
-        this._currentIllumination = value;
-        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.persistCurrentIllumination(new CurrentIlluminationDataPoint_1.CurrentIlluminationDataPoint(this.info.room, this.info.devID, value, new Date(), (_c = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.LampenGroup) === null || _b === void 0 ? void 0 : _b.anyLightsOwn()) !== null && _c !== void 0 ? _c : false));
+    get timeSinceLastMotion() {
+        return Math.floor((services_1.Utils.nowMS() - this._lastMotionTime) / 1000);
     }
     get detectionsToday() {
         return this._detectionsToday;
     }
     set detectionsToday(pVal) {
+        var _a;
         const oldVal = this._detectionsToday;
         this._detectionsToday = pVal;
-        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.persistTodayCount(this, pVal, oldVal);
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistTodayCount(this, pVal, oldVal);
+    }
+    get currentIllumination() {
+        return this._currentIllumination;
+    }
+    set currentIllumination(value) {
+        var _a, _b, _c, _d;
+        this._currentIllumination = value;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistCurrentIllumination(new models_1.CurrentIlluminationDataPoint(this.info.room, this.info.devID, value, new Date(), (_d = (_c = (_b = this.room) === null || _b === void 0 ? void 0 : _b.LampenGroup) === null || _c === void 0 ? void 0 : _c.anyLightsOwn()) !== null && _d !== void 0 ? _d : false));
     }
     addMovementCallback(pCallback) {
         this._movementDetectedCallback.push(pCallback);
     }
     update(idSplit, state, initial = false) {
-        this.log(logLevel_1.LogLevel.DeepTrace, `Bewegungs Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
+        this.log(models_1.LogLevel.DeepTrace, `Bewegungs Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
         super.update(idSplit, state, initial, true);
         if (idSplit[3] !== '3') {
             // Nur die Infos in Kanal 3 sind relevant
@@ -62,14 +66,14 @@ class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
     }
     updateMovement(pVal) {
         if (!this.initialized && pVal) {
-            this.log(logLevel_1.LogLevel.Trace, `Bewegung erkannt aber die Initialisierung aus der DB ist noch nicht erfolgt --> verzögern`);
-            utils_1.Utils.guardedTimeout(() => {
+            this.log(models_1.LogLevel.Trace, `Bewegung erkannt aber die Initialisierung aus der DB ist noch nicht erfolgt --> verzögern`);
+            services_1.Utils.guardedTimeout(() => {
                 this.updateMovement(pVal);
             }, 1000, this);
             return;
         }
         if (pVal === this.movementDetected) {
-            this.log(logLevel_1.LogLevel.Debug, `Überspringe Bewegung da bereits der Wert ${pVal} vorliegt`);
+            this.log(models_1.LogLevel.Debug, `Überspringe Bewegung da bereits der Wert ${pVal} vorliegt`);
             if (pVal) {
                 this.resetFallbackTimeout();
                 this.startFallbackTimeout();
@@ -78,11 +82,12 @@ class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
         }
         this.resetFallbackTimeout();
         this.movementDetected = pVal;
-        this.log(logLevel_1.LogLevel.Debug, `Neuer Bewegunsstatus Wert : ${pVal}`);
+        this.log(models_1.LogLevel.Debug, `Neuer Bewegunsstatus Wert : ${pVal}`);
         if (pVal) {
             this.startFallbackTimeout();
             this.detectionsToday++;
-            this.log(logLevel_1.LogLevel.Trace, `Dies ist die ${this.detectionsToday} Bewegung `);
+            this._lastMotionTime = services_1.Utils.nowMS();
+            this.log(models_1.LogLevel.Trace, `Dies ist die ${this.detectionsToday} Bewegung `);
         }
         for (const c of this._movementDetectedCallback) {
             c(pVal);
@@ -90,13 +95,13 @@ class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
     }
     resetFallbackTimeout() {
         if (this._fallBackTimeout) {
-            this.log(logLevel_1.LogLevel.Trace, `Fallback Timeout zurücksetzen`);
+            this.log(models_1.LogLevel.Trace, `Fallback Timeout zurücksetzen`);
             clearTimeout(this._fallBackTimeout);
         }
     }
     startFallbackTimeout() {
-        this._fallBackTimeout = utils_1.Utils.guardedTimeout(() => {
-            this.log(logLevel_1.LogLevel.Debug, `Benötige Fallback Bewegungs Reset `);
+        this._fallBackTimeout = services_1.Utils.guardedTimeout(() => {
+            this.log(models_1.LogLevel.Debug, `Benötige Fallback Bewegungs Reset `);
             this._fallBackTimeout = undefined;
             this.updateMovement(false);
         }, 270000, this);

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

@@ -1,7 +1,7 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
 import { DeviceInfo } from '../DeviceInfo';
-import { TemperaturSettings } from '../../../models/temperaturSettings';
+import { TemperaturSettings } from '../../../models';
 import { iTemperaturSensor } from '../iTemperaturSensor';
 import { iHumiditySensor } from '../iHumiditySensor';
 import { iHeater } from '../iHeater';
@@ -10,27 +10,27 @@ export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperaturSen
     private _iAutomaticInterval;
     private _level;
     private _temperatur;
-    private _humidity;
-    private _desiredTemperatur;
     private _setPointTemperaturID;
     private _automaticFallBackTemperatur;
     private _automaticPoints;
     private _humidityCallbacks;
     constructor(pInfo: DeviceInfo);
-    get sLevel(): string;
-    get iLevel(): number;
-    get sTemperatur(): string;
-    get iTemperatur(): number;
+    private _humidity;
     get humidity(): number;
     private set humidity(value);
+    private _desiredTemperatur;
     get desiredTemperatur(): number;
     set desiredTemperatur(val: number);
+    get sLevel(): string;
+    get iLevel(): number;
+    get sTemperatur(): string;
+    get iTemperatur(): number;
     addHumidityCallback(pCallback: (pValue: number) => void): void;
     deleteAutomaticPoint(name: string): void;
     getBelongingHeizungen(): iHeater[];
     setAutomaticPoint(name: string, setting: TemperaturSettings): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     stopAutomaticCheck(): void;
-    private updateBaseInformation;
     checkAutomaticChange(): void;
+    private updateBaseInformation;
 }

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

@@ -3,37 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpHeizgruppe = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
-const utils_1 = require("../../services/utils/utils");
-const temperaturSettings_1 = require("../../../models/temperaturSettings");
-const logLevel_1 = require("../../../models/logLevel");
+const services_1 = require("../../services");
+const models_1 = require("../../../models");
 const device_cluster_type_1 = require("../device-cluster-type");
-const index_1 = require("../../../index");
 class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpHeizgruppe);
         this._automaticMode = true;
         this._level = 0;
         this._temperatur = 0;
-        this._humidity = 0;
-        this._desiredTemperatur = 0;
         this._setPointTemperaturID = '';
         this._automaticFallBackTemperatur = 20;
         this._automaticPoints = {};
         this._humidityCallbacks = [];
+        this._humidity = 0;
+        this._desiredTemperatur = 0;
         this._setPointTemperaturID = `${this.info.fullID}.1.SET_POINT_TEMPERATURE`;
-        this._iAutomaticInterval = utils_1.Utils.guardedInterval(this.checkAutomaticChange, 300000, this); // Alle 5 Minuten prüfen
-    }
-    get sLevel() {
-        return `${this._level * 100}%`;
-    }
-    get iLevel() {
-        return this._level;
-    }
-    get sTemperatur() {
-        return `${this._temperatur}°C`;
-    }
-    get iTemperatur() {
-        return this._temperatur;
+        this._iAutomaticInterval = services_1.Utils.guardedInterval(this.checkAutomaticChange, 300000, this); // Alle 5 Minuten prüfen
     }
     get humidity() {
         return this._humidity;
@@ -49,11 +35,23 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     }
     set desiredTemperatur(val) {
         this.setState(this._setPointTemperaturID, val, () => {
-            this.log(logLevel_1.LogLevel.Info, `Changed temperature of to "${val}.`);
+            this.log(models_1.LogLevel.Info, `Changed temperature of to "${val}.`);
         }, (err) => {
-            this.log(logLevel_1.LogLevel.Error, `Temperaturänderung ergab Fehler ${err}.`);
+            this.log(models_1.LogLevel.Error, `Temperaturänderung ergab Fehler ${err}.`);
         });
     }
+    get sLevel() {
+        return `${this._level * 100}%`;
+    }
+    get iLevel() {
+        return this._level;
+    }
+    get sTemperatur() {
+        return `${this._temperatur}°C`;
+    }
+    get iTemperatur() {
+        return this._temperatur;
+    }
     addHumidityCallback(pCallback) {
         this._humidityCallbacks.push(pCallback);
         if (this._humidity > 0) {
@@ -68,14 +66,13 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         if (!this.room) {
             return [];
         }
-        const result = this.room.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Heater);
-        return result;
+        return this.room.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Heater);
     }
     setAutomaticPoint(name, setting) {
         this._automaticPoints[name] = setting;
     }
     update(idSplit, state, initial = false) {
-        this.log(logLevel_1.LogLevel.DeepTrace, `Heizgruppe Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        this.log(models_1.LogLevel.DeepTrace, `Heizgruppe Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case '1':
@@ -89,6 +86,24 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
             this._iAutomaticInterval = undefined;
         }
     }
+    checkAutomaticChange() {
+        var _a, _b, _c;
+        if (!this._automaticMode) {
+            (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.addTemperaturDataPoint(this);
+            return;
+        }
+        const setting = models_1.TemperaturSettings.getActiveSetting(this._automaticPoints, new Date());
+        if (setting === undefined) {
+            this.log(models_1.LogLevel.Warn, `Undefined Heating Timestamp.`);
+            this.desiredTemperatur = this._automaticFallBackTemperatur;
+            return;
+        }
+        if (this._desiredTemperatur !== setting.temperatur) {
+            this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${setting.temperatur}°C`);
+            this.desiredTemperatur = (_b = setting.temperatur) !== null && _b !== void 0 ? _b : this._automaticFallBackTemperatur;
+        }
+        (_c = services_1.Utils.dbo) === null || _c === void 0 ? void 0 : _c.addTemperaturDataPoint(this);
+    }
     updateBaseInformation(name, state) {
         switch (name) {
             case 'ACTUAL_TEMPERATURE':
@@ -101,28 +116,10 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
                 this.humidity = state.val;
                 break;
             case 'SET_POINT_TEMPERATURE':
-                this.log(logLevel_1.LogLevel.DeepTrace, `Heizgruppe Update Soll-Temperatur JSON: ${JSON.stringify(state)}`);
+                this.log(models_1.LogLevel.DeepTrace, `Heizgruppe Update Soll-Temperatur JSON: ${JSON.stringify(state)}`);
                 this._desiredTemperatur = state.val;
                 break;
         }
     }
-    checkAutomaticChange() {
-        var _a;
-        if (!this._automaticMode) {
-            index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.addTemperaturDataPoint(this);
-            return;
-        }
-        const setting = temperaturSettings_1.TemperaturSettings.getActiveSetting(this._automaticPoints, new Date());
-        if (setting === undefined) {
-            this.log(logLevel_1.LogLevel.Warn, `Undefined Heating Timestamp.`);
-            this.desiredTemperatur = this._automaticFallBackTemperatur;
-            return;
-        }
-        if (this._desiredTemperatur !== setting.temperatur) {
-            this.log(logLevel_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${setting.temperatur}°C`);
-            this.desiredTemperatur = (_a = setting.temperatur) !== null && _a !== void 0 ? _a : this._automaticFallBackTemperatur;
-        }
-        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.addTemperaturDataPoint(this);
-    }
 }
 exports.HmIpHeizgruppe = HmIpHeizgruppe;

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

@@ -1,9 +1,8 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
-import { ActuatorSettings } from '../../../models';
+import { ActuatorSettings, TimeOfDay } from '../../../models';
 import { DeviceInfo } from '../DeviceInfo';
 import { iLamp } from '../iLamp';
-import { TimeOfDay } from '../../services';
 export declare class HmIpLampe extends HmIPDevice implements iLamp {
     lightOn: boolean;
     queuedLightValue: boolean | null;

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

@@ -5,8 +5,6 @@ const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
 const services_1 = require("../../services");
 const models_1 = require("../../../models");
-const models_2 = require("../../../models");
-const services_2 = require("../../services");
 class HmIpLampe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpLampe);
@@ -19,7 +17,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
         this.lightOnSwitchID = `${this.info.fullID}.2.STATE`;
     }
     update(idSplit, state, initial = false) {
-        this.log(models_2.LogLevel.DeepTrace, `Lampen Update : ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        this.log(models_1.LogLevel.DeepTrace, `Lampen Update : ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         this.queuedLightValue = null;
         switch (idSplit[3]) {
@@ -33,20 +31,20 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
     /** @inheritdoc */
     setLight(pValue, timeout = -1, force = false) {
         if (!force && pValue === this.lightOn && this.queuedLightValue === null) {
-            this.log(models_2.LogLevel.DeepTrace, `Skip light command as it is already ${pValue}`);
+            this.log(models_1.LogLevel.DeepTrace, `Skip light command as it is already ${pValue}`);
             return;
         }
         if (this.lightOnSwitchID === '') {
-            this.log(models_2.LogLevel.Error, `Keine Switch ID bekannt.`);
+            this.log(models_1.LogLevel.Error, `Keine Switch ID bekannt.`);
             return;
         }
         if (!force && services_1.Utils.nowMS() < this.turnOffTime) {
-            this.log(models_2.LogLevel.Debug, `Skip automatic command to ${pValue} as it is locked until ${new Date(this.turnOffTime).toLocaleString()}`);
+            this.log(models_1.LogLevel.Debug, `Skip automatic command to ${pValue} as it is locked until ${new Date(this.turnOffTime).toLocaleString()}`);
             return;
         }
-        this.log(models_2.LogLevel.Debug, `Lampe schalten Wert: ${pValue}`);
+        this.log(models_1.LogLevel.Debug, `Lampe schalten Wert: ${pValue}`);
         this.setState(this.lightOnSwitchID, pValue, undefined, (err) => {
-            this.log(models_2.LogLevel.Error, `Lampe schalten ergab Fehler: ${err}`);
+            this.log(models_1.LogLevel.Error, `Lampe schalten ergab Fehler: ${err}`);
         });
         this.queuedLightValue = pValue;
         if (this.settings.isStromStoss) {
@@ -67,7 +65,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
         }
         this.turnOffTime = services_1.Utils.nowMS() + timeout;
         this._turnOffTimeout = services_1.Utils.guardedTimeout(() => {
-            this.log(models_2.LogLevel.Debug, `Delayed Turnoff initiated`);
+            this.log(models_1.LogLevel.Debug, `Delayed Turnoff initiated`);
             this._turnOffTimeout = undefined;
             if (!this.room) {
                 this.setLight(false, -1, true);
@@ -82,7 +80,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
         const newVal = this.queuedLightValue !== null ? !this.queuedLightValue : !this.lightOn;
         const timeout = newVal && force ? 30 * 60 * 1000 : -1;
         if (newVal && time === undefined && calculateTime && this.room !== undefined) {
-            time = services_2.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);
@@ -92,9 +90,9 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
         return newVal;
     }
     setTimeBased(time, timeout = -1, force = false) {
-        if ((time === services_2.TimeOfDay.Night && this.settings.nightOn) ||
-            (time === services_2.TimeOfDay.BeforeSunrise && this.settings.dawnOn) ||
-            (time === services_2.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/hmIPDevices/hmIpPraezenz.d.ts

@@ -3,19 +3,19 @@ import { HmIPDevice } from './hmIpDevice';
 import { DeviceInfo } from '../DeviceInfo';
 import { iIlluminationSensor } from '../iIlluminationSensor';
 export declare class HmIpPraezenz extends HmIPDevice implements iIlluminationSensor {
+    private static PRESENCE_DETECTION;
+    private static CURRENT_ILLUMINATION;
     excludeFromNightAlarm: boolean;
     presenceDetected: boolean;
-    private _detectionsToday;
     private _presenceDetectedCallback;
-    private static PRESENCE_DETECTION;
-    private static CURRENT_ILLUMINATION;
     private initialized;
-    private _currentIllumination;
+    constructor(pInfo: DeviceInfo);
+    private _detectionsToday;
     get detectionsToday(): number;
     set detectionsToday(pVal: number);
+    private _currentIllumination;
     get currentIllumination(): number;
     private set currentIllumination(value);
-    constructor(pInfo: DeviceInfo);
     addPresenceCallback(pCallback: (pValue: boolean) => void): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     updatePresence(pVal: boolean): void;

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

@@ -3,51 +3,51 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpPraezenz = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
-const utils_1 = require("../../services/utils/utils");
-const CurrentIlluminationDataPoint_1 = require("../../../models/persistence/CurrentIlluminationDataPoint");
-const logLevel_1 = require("../../../models/logLevel");
-const index_1 = require("../../../index");
+const models_1 = require("../../../models");
+const services_1 = require("../../services");
 class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
+        var _a;
         super(pInfo, deviceType_1.DeviceType.HmIpPraezenz);
         this.excludeFromNightAlarm = false;
         this.presenceDetected = false;
-        this._detectionsToday = 0;
         this._presenceDetectedCallback = [];
         // private presenceStateID: string;
         this.initialized = false;
+        this._detectionsToday = 0;
         this._currentIllumination = -1;
         // this.presenceStateID = `${this.info.fullID}.1.${HmIpPraezenz.PRESENCE_DETECTION}`;
-        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.getCount(this).then((todayCount) => {
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.getCount(this).then((todayCount) => {
             this.detectionsToday = todayCount.counter;
-            this.log(logLevel_1.LogLevel.Debug, `Präsenzcounter vorinitialisiert mit ${this.detectionsToday}`);
+            this.log(models_1.LogLevel.Debug, `Präsenzcounter vorinitialisiert mit ${this.detectionsToday}`);
             this.initialized = true;
         }).catch((err) => {
             var _a;
-            this.log(logLevel_1.LogLevel.Warn, `Failed to initialize Movement Counter, err ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}`);
+            this.log(models_1.LogLevel.Warn, `Failed to initialize Movement Counter, err ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : err}`);
         });
     }
     get detectionsToday() {
         return this._detectionsToday;
     }
     set detectionsToday(pVal) {
+        var _a;
         const oldVal = this._detectionsToday;
         this._detectionsToday = pVal;
-        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.persistTodayCount(this, pVal, oldVal);
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistTodayCount(this, pVal, oldVal);
     }
     get currentIllumination() {
         return this._currentIllumination;
     }
     set currentIllumination(value) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         this._currentIllumination = value;
-        index_1.dbo === null || index_1.dbo === void 0 ? void 0 : index_1.dbo.persistCurrentIllumination(new CurrentIlluminationDataPoint_1.CurrentIlluminationDataPoint(this.info.room, this.info.devID, value, new Date(), (_c = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.LampenGroup) === null || _b === void 0 ? void 0 : _b.anyLightsOwn()) !== null && _c !== void 0 ? _c : false));
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistCurrentIllumination(new models_1.CurrentIlluminationDataPoint(this.info.room, this.info.devID, value, new Date(), (_d = (_c = (_b = this.room) === null || _b === void 0 ? void 0 : _b.LampenGroup) === null || _c === void 0 ? void 0 : _c.anyLightsOwn()) !== null && _d !== void 0 ? _d : false));
     }
     addPresenceCallback(pCallback) {
         this._presenceDetectedCallback.push(pCallback);
     }
     update(idSplit, state, initial = false) {
-        this.log(logLevel_1.LogLevel.DeepTrace, `Präzens Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
+        this.log(models_1.LogLevel.DeepTrace, `Präzens Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
         super.update(idSplit, state, initial, true);
         if (idSplit[3] !== '1') {
             // Nur die Infos in Kanal 1 sind relevant
@@ -64,21 +64,21 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
     }
     updatePresence(pVal) {
         if (!this.initialized && pVal) {
-            this.log(logLevel_1.LogLevel.Debug, `Präsenz erkannt aber die Initialisierung aus der DB ist noch nicht erfolgt --> verzögern`);
-            utils_1.Utils.guardedTimeout(() => {
+            this.log(models_1.LogLevel.Debug, `Präsenz erkannt aber die Initialisierung aus der DB ist noch nicht erfolgt --> verzögern`);
+            services_1.Utils.guardedTimeout(() => {
                 this.updatePresence(pVal);
             }, 1000, this);
             return;
         }
         if (pVal === this.presenceDetected) {
-            this.log(logLevel_1.LogLevel.Debug, `Überspringe Präsenz da bereits der Wert ${pVal} vorliegt`);
+            this.log(models_1.LogLevel.Debug, `Überspringe Präsenz da bereits der Wert ${pVal} vorliegt`);
             return;
         }
         this.presenceDetected = pVal;
-        this.log(logLevel_1.LogLevel.Debug, `Neuer Präsenzstatus Wert : ${pVal}`);
+        this.log(models_1.LogLevel.Debug, `Neuer Präsenzstatus Wert : ${pVal}`);
         if (pVal) {
             this.detectionsToday++;
-            this.log(logLevel_1.LogLevel.Trace, `Dies ist die ${this.detectionsToday} Bewegung `);
+            this.log(models_1.LogLevel.Trace, `Dies ist die ${this.detectionsToday} Bewegung `);
         }
         for (const c of this._presenceDetectedCallback) {
             c(pVal);

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

@@ -0,0 +1,11 @@
+import { LogLevel, RoomBase } from '../../models';
+import { DeviceType } from './deviceType';
+import { DeviceInfo } from './DeviceInfo';
+export interface IBaseDevice {
+    room: RoomBase | undefined;
+    deviceType: DeviceType;
+    info: DeviceInfo;
+    readonly id: string;
+    battery: number | undefined;
+    log(level: LogLevel, message: string): void;
+}

package/lib/server/devices/iBaseDevice.js

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

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

@@ -1,6 +1,6 @@
 import { Button } from './button';
-import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
-export interface iButtonSwitch extends IoBrokerBaseDevice {
+import { IBaseDevice } from './iBaseDevice';
+export interface iButtonSwitch extends IBaseDevice {
     buttonTopLeft: Button | undefined;
     buttonTopRight: Button | undefined;
     buttonMidLeft: Button | undefined;

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

@@ -1,6 +1,19 @@
-import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
 import { iExcessEnergyConsumer } from './iExcessEnergyConsumer';
-export interface iEnergyManager extends IoBrokerBaseDevice {
+import { IBaseDevice } from './iBaseDevice';
+export declare class PhaseState {
+    private readonly _meterValue;
+    private readonly _production;
+    private readonly _injectingWattage;
+    private readonly _drawingWattage;
+    private readonly _selfConsumingWattage;
+    private readonly _totalConsumption;
+    constructor(_meterValue: number, _production: number);
+    get selfConsumingWattage(): number;
+    get drawingWattage(): number;
+    get injectingWattage(): number;
+    get totalConsumptionWattage(): number;
+}
+export interface iEnergyManager extends IBaseDevice {
     baseConsumption: number;
     currentProduction: number;
     excessEnergy: number;
@@ -9,6 +22,9 @@ export interface iEnergyManager extends IoBrokerBaseDevice {
     drawingWattage: number;
     selfConsumingWattage: number;
     injectingWattage: number;
+    phaseAState: PhaseState;
+    phaseBState: PhaseState;
+    phaseCState: PhaseState;
     addExcessConsumer(device: iExcessEnergyConsumer): void;
     recalculatePowerSharing(): void;
     cleanup(): void;

package/lib/server/devices/iEnergyManager.js

@@ -1,2 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PhaseState = void 0;
+class PhaseState {
+    constructor(_meterValue, _production) {
+        this._meterValue = _meterValue;
+        this._production = _production;
+        this._injectingWattage = 0;
+        this._drawingWattage = 0;
+        this._selfConsumingWattage = 0;
+        this._totalConsumption = 0;
+        this._injectingWattage = Math.max(0, this._meterValue);
+        this._selfConsumingWattage = this._production - Math.max(0, this._meterValue);
+        this._drawingWattage = Math.min(0, this._meterValue) * -1;
+        this._totalConsumption = this._production - this._meterValue;
+    }
+    get selfConsumingWattage() {
+        return this._selfConsumingWattage;
+    }
+    get drawingWattage() {
+        return this._drawingWattage;
+    }
+    get injectingWattage() {
+        return this._injectingWattage;
+    }
+    get totalConsumptionWattage() {
+        return this._totalConsumption;
+    }
+}
+exports.PhaseState = PhaseState;

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

@@ -1,6 +1,6 @@
-import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
-import { ExcessEnergyConsumerSettings } from '../../models/excessEnergyConsumerSettings';
-export interface iExcessEnergyConsumer extends IoBrokerBaseDevice {
+import { ExcessEnergyConsumerSettings } from '../../models';
+import { IBaseDevice } from './iBaseDevice';
+export interface iExcessEnergyConsumer extends IBaseDevice {
     energyConsumerSettings: ExcessEnergyConsumerSettings;
     currentConsumption: number;
 }