hoffmation-base 0.1.22 → 0.1.26

package/lib/server/devices/devices.js

@@ -2,33 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Devices = void 0;
 const logLevel_1 = require("../../models/logLevel");
-const hmIpDeviceType_1 = require("./hmIPDevices/hmIpDeviceType");
-const zigbeeDeviceType_1 = require("./zigbee/zigbeeDeviceType");
+const deviceType_1 = require("./deviceType");
 const log_service_1 = require("../services/log-service");
 const hmIpDevice_1 = require("./hmIPDevices/hmIpDevice");
 const zigbeeDevice_1 = require("./zigbee/zigbeeDevice");
-const hmIpGriff_1 = require("./hmIPDevices/hmIpGriff");
-const hmIpHeizung_1 = require("./hmIPDevices/hmIpHeizung");
 const DeviceInfo_1 = require("./DeviceInfo");
-const hmIpLampe_1 = require("./hmIPDevices/hmIpLampe");
-const hmIpPraezenz_1 = require("./hmIPDevices/hmIpPraezenz");
-const hmIpRoll_1 = require("./hmIPDevices/hmIpRoll");
-const hmIpTaster_1 = require("./hmIPDevices/hmIpTaster");
-const hmIpTherm_1 = require("./hmIPDevices/hmIpTherm");
-const hmIpTuer_1 = require("./hmIPDevices/hmIpTuer");
-const hmIpWippe_1 = require("./hmIPDevices/hmIpWippe");
-const hmIpHeizgruppe_1 = require("./hmIPDevices/hmIpHeizgruppe");
-const hmIpBewegung_1 = require("./hmIPDevices/hmIpBewegung");
-const zigbeeIkeaSteckdose_1 = require("./zigbee/zigbeeIkeaSteckdose");
-const zigbeeIlluLedRGBCCT_1 = require("./zigbee/zigbeeIlluLedRGBCCT");
-const zigbeeAquaraVibra_1 = require("./zigbee/zigbeeAquaraVibra");
-const zigbeeIlluDimmer_1 = require("./zigbee/zigbeeIlluDimmer");
-const zigbeeHeimanSmoke_1 = require("./zigbee/zigbeeHeimanSmoke");
-const zigbeeAquaraWater_1 = require("./zigbee/zigbeeAquaraWater");
-const zigbeeBlitzShp_1 = require("./zigbee/zigbeeBlitzShp");
-const zigbeeIlluLampe_1 = require("./zigbee/zigbeeIlluLampe");
-const zigbeeIlluActuator_1 = require("./zigbee/zigbeeIlluActuator");
-const zigbeeAquaraMotion_1 = require("./zigbee/zigbeeAquaraMotion");
 class Devices {
     constructor(pDeviceData, pRoomImportEnforcer) {
         // This forces import of rooms at correct timing, to allow devices to land in proper rooms.
@@ -54,11 +32,8 @@ class Devices {
         zigbeeDevice_1.ZigbeeDevice.checkMissing();
     }
     static addIoConnection(pIoConnection) {
-        for (const id in Devices.hmIP) {
-            Devices.hmIP[id].ioConn = pIoConnection;
-        }
-        for (const id in Devices.Zigbee) {
-            Devices.Zigbee[id].ioConn = pIoConnection;
+        for (const id in Devices.alLDevices) {
+            Devices.alLDevices[id].ioConn = pIoConnection;
         }
     }
     static midnightReset() {
@@ -66,13 +41,13 @@ class Devices {
     }
     static resetPraesenzCount() {
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `3 Uhr Reset der Präsenzmelder`);
-        for (const dID in Devices.hmIP) {
-            const d = Devices.hmIP[dID];
-            if (d.deviceType === hmIpDeviceType_1.HmIpDeviceType.HmIpPraezenz) {
+        for (const dID in Devices.alLDevices) {
+            const d = Devices.alLDevices[dID];
+            if (d.deviceType === deviceType_1.DeviceType.HmIpPraezenz) {
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `2 Uhr Reset der Tages Detektionen von ${d.info.customName}`);
                 d.detectionsToday = 0;
             }
-            else if (d.deviceType === hmIpDeviceType_1.HmIpDeviceType.HmIpBewegung) {
+            else if (d.deviceType === deviceType_1.DeviceType.HmIpBewegung) {
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `2 Uhr Reset der Tages Detektionen von ${d.info.customName}`);
                 d.detectionsToday = 0;
             }
@@ -80,93 +55,27 @@ class Devices {
     }
     processZigbeeDevice(cDevConf) {
         const zigbeeInfo = new DeviceInfo_1.DeviceInfo(cDevConf);
-        if (typeof Devices.Zigbee[zigbeeInfo.devID] !== 'undefined') {
+        const fullName = `${Devices.IDENTIFIER_HOMEMATIC}-${zigbeeInfo.devID}`;
+        if (typeof Devices.alLDevices[fullName] !== 'undefined') {
             return;
         }
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `${zigbeeInfo.devID} with Type "${zigbeeInfo.deviceType}" doesn't exists --> create it`);
-        switch (zigbeeInfo.deviceType) {
-            case 'AquaraVibra':
-                Devices.Zigbee[zigbeeInfo.devID] = new zigbeeAquaraVibra_1.ZigbeeAquaraVibra(zigbeeInfo);
-                break;
-            case 'AquaraMotion':
-                Devices.Zigbee[zigbeeInfo.devID] = new zigbeeAquaraMotion_1.ZigbeeAquaraMotion(zigbeeInfo);
-                break;
-            case 'IkeaStecker':
-                Devices.Zigbee[zigbeeInfo.devID] = new zigbeeIkeaSteckdose_1.ZigbeeIkeaSteckdose(zigbeeInfo);
-                break;
-            case 'LedRGBCCT':
-                Devices.Zigbee[zigbeeInfo.devID] = new zigbeeIlluLedRGBCCT_1.ZigbeeIlluLedRGBCCT(zigbeeInfo);
-                break;
-            case 'IlluDimmer':
-                Devices.Zigbee[zigbeeInfo.devID] = new zigbeeIlluDimmer_1.ZigbeeIlluDimmer(zigbeeInfo);
-                break;
-            case 'HeimanSmoke':
-                Devices.Zigbee[zigbeeInfo.devID] = new zigbeeHeimanSmoke_1.ZigbeeHeimanSmoke(zigbeeInfo);
-                break;
-            case 'AquaraWater':
-                Devices.Zigbee[zigbeeInfo.devID] = new zigbeeAquaraWater_1.ZigbeeAquaraWater(zigbeeInfo);
-                break;
-            case 'BlitzShp':
-                Devices.Zigbee[zigbeeInfo.devID] = new zigbeeBlitzShp_1.ZigbeeBlitzShp(zigbeeInfo);
-                break;
-            case 'IlluLampe':
-                Devices.Zigbee[zigbeeInfo.devID] = new zigbeeIlluLampe_1.ZigbeeIlluLampe(zigbeeInfo);
-                break;
-            case 'IlluActuator':
-                Devices.Zigbee[zigbeeInfo.devID] = new zigbeeIlluActuator_1.ZigbeeIlluActuator(zigbeeInfo);
-                break;
-            default:
-                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `No zigbee Device Type for ${zigbeeInfo.deviceType} defined`);
-                Devices.Zigbee[zigbeeInfo.devID] = new zigbeeDevice_1.ZigbeeDevice(zigbeeInfo, zigbeeDeviceType_1.ZigbeeDeviceType.unknown);
-        }
+        Devices.alLDevices[fullName] = zigbeeDevice_1.ZigbeeDevice.createRespectiveDevice(zigbeeInfo);
+        Devices.alLDevices[fullName].allDevicesKey = fullName;
     }
     processHMIPDevice(cDevConf) {
         const hmIPInfo = new DeviceInfo_1.DeviceInfo(cDevConf);
-        if (typeof Devices.hmIP[hmIPInfo.devID] !== 'undefined') {
+        const fullName = `${Devices.IDENTIFIER_HOMEMATIC}-${hmIPInfo.devID}`;
+        if (typeof Devices.alLDevices[fullName] !== 'undefined') {
             return;
         }
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `${hmIPInfo.devID} with Type "${hmIPInfo.deviceType}" doesn't exists --> create it`);
-        switch (hmIPInfo.deviceType) {
-            case 'Lampe':
-                Devices.hmIP[hmIPInfo.devID] = new hmIpLampe_1.HmIpLampe(hmIPInfo);
-                break;
-            case 'Roll':
-            case 'Broll':
-                Devices.hmIP[hmIPInfo.devID] = new hmIpRoll_1.HmIpRoll(hmIPInfo);
-                break;
-            case 'Beweg':
-                Devices.hmIP[hmIPInfo.devID] = new hmIpBewegung_1.HmIpBewegung(hmIPInfo);
-                break;
-            case 'Taster':
-                Devices.hmIP[hmIPInfo.devID] = new hmIpTaster_1.HmIpTaster(hmIPInfo);
-                break;
-            case 'Wippe':
-                Devices.hmIP[hmIPInfo.devID] = new hmIpWippe_1.HmIpWippe(hmIPInfo);
-                break;
-            case 'Praezenz':
-                Devices.hmIP[hmIPInfo.devID] = new hmIpPraezenz_1.HmIpPraezenz(hmIPInfo);
-                break;
-            case 'Griff':
-                Devices.hmIP[hmIPInfo.devID] = new hmIpGriff_1.HmIpGriff(hmIPInfo);
-                break;
-            case 'Thermostat':
-                Devices.hmIP[hmIPInfo.devID] = new hmIpTherm_1.HmIpTherm(hmIPInfo);
-                break;
-            case 'Heizung':
-                Devices.hmIP[hmIPInfo.devID] = new hmIpHeizung_1.HmIpHeizung(hmIPInfo);
-                break;
-            case 'Tuer':
-                Devices.hmIP[hmIPInfo.devID] = new hmIpTuer_1.HmIpTuer(hmIPInfo);
-                break;
-            case 'HeizGr':
-                Devices.hmIP[hmIPInfo.devID] = new hmIpHeizgruppe_1.HmIpHeizgruppe(hmIPInfo);
-                break;
-            default:
-                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `No HmIP Device Type for ${hmIPInfo.deviceType} defined`);
-                Devices.hmIP[hmIPInfo.devID] = new hmIpDevice_1.HmIPDevice(hmIPInfo, hmIpDeviceType_1.HmIpDeviceType.unknown);
-        }
+        const d = hmIpDevice_1.HmIPDevice.createRespectiveDevice(hmIPInfo);
+        Devices.alLDevices[fullName] = d;
+        Devices.alLDevices[fullName].allDevicesKey = fullName;
     }
 }
 exports.Devices = Devices;
-Devices.hmIP = {};
-Devices.Zigbee = {};
+Devices.IDENTIFIER_HOMEMATIC = 'hm-rpc';
+Devices.IDENTIFIER_ZIGBEE = 'zigbee';
+Devices.alLDevices = {};

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

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HeatGroup = void 0;
 class HeatGroup {
-    constructor(_room, heaters) {
+    constructor(
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    _room, heaters) {
         this._room = _room;
         this.heaters = heaters;
-        for (const h of [...heaters]) {
-            h.room = this._room;
-        }
     }
     get currentTemp() {
         if (this.heaters.length === 0) {

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

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LampenGroup = void 0;
 const time_callback_service_1 = require("../../services/time-callback-service");
 class LampenGroup {
-    constructor(_room, Lampen, Stecker, LED = []) {
+    constructor(
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    _room, Lampen, Stecker, LED = []) {
         this._room = _room;
         this.Lampen = Lampen;
         this.Stecker = Stecker;
         this.LED = LED;
-        for (const lamp of [...Lampen, ...Stecker, ...LED]) {
-            lamp.room = this._room;
-        }
     }
     anyLightsOwn() {
         let i;

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

@@ -5,9 +5,6 @@ class TasterGroup {
     constructor(_room, Taster) {
         this._room = _room;
         this.Taster = Taster;
-        for (const t of [...Taster]) {
-            t.room = this._room;
-        }
     }
     initCallbacks() {
         this.Taster.forEach((t) => {

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

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpBewegung = void 0;
 const logLevel_1 = require("../../../models/logLevel");
 const hmIpDevice_1 = require("./hmIpDevice");
-const hmIpDeviceType_1 = require("./hmIpDeviceType");
+const deviceType_1 = require("../deviceType");
 const log_service_1 = require("../../services/log-service");
 const persist_1 = require("../../services/dbo/persist");
 const utils_1 = require("../../services/utils/utils");
 const CurrentIlluminationDataPoint_1 = require("../../../models/persistence/CurrentIlluminationDataPoint");
 class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
-        super(pInfo, hmIpDeviceType_1.HmIpDeviceType.HmIpBewegung);
+        super(pInfo, deviceType_1.DeviceType.HmIpBewegung);
         this.excludeFromNightAlarm = false;
         this.movementDetected = false;
         this._detectionsToday = 0;

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

@@ -1,19 +1,10 @@
 /// <reference types="iobroker" />
 import { DeviceInfo } from '../DeviceInfo';
-import { HmIpDeviceType } from './hmIpDeviceType';
-import { HmIpRoomSettings } from '../../../models/rooms/RoomSettings/hmIPRoomSettings';
-import { ioBrokerBaseDevice } from '../iIoBrokerDevice';
-import { RoomBase } from '../../../models/rooms/RoomBase';
-export declare class HmIPDevice extends ioBrokerBaseDevice {
-    static roomSettings: {
-        [id: string]: HmIpRoomSettings;
-    };
+import { DeviceType } from '../deviceType';
+import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
+export declare class HmIPDevice extends IoBrokerBaseDevice {
     lowBattery: boolean;
-    deviceType: HmIpDeviceType;
-    room: RoomBase | undefined;
-    static addRoom(shortName: string, settings: HmIpRoomSettings): void;
-    static checkMissing(): void;
-    constructor(pInfo: DeviceInfo, pType: HmIpDeviceType);
-    protected addToCorrectRoom(): void;
+    static createRespectiveDevice(hmIPInfo: DeviceInfo): HmIPDevice;
+    constructor(pInfo: DeviceInfo, pType: DeviceType);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
 }

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

@@ -2,52 +2,58 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIPDevice = void 0;
 const logLevel_1 = require("../../../models/logLevel");
+const deviceType_1 = require("../deviceType");
 const log_service_1 = require("../../services/log-service");
-const iIoBrokerDevice_1 = require("../iIoBrokerDevice");
-class HmIPDevice extends iIoBrokerDevice_1.ioBrokerBaseDevice {
+const IoBrokerBaseDevice_1 = require("../IoBrokerBaseDevice");
+const index_1 = require("./index");
+class HmIPDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     constructor(pInfo, pType) {
-        super(pInfo);
+        super(pInfo, pType);
         this.lowBattery = false;
-        this.room = undefined;
-        this.deviceType = pType;
         this.addToCorrectRoom();
     }
-    static addRoom(shortName, settings) {
-        if (this.roomSettings[shortName] !== undefined) {
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Alert, `Es gibt bereits ein Registrat für HmIpRoomsettings für den Raumnamen "${shortName}"`);
-            return;
-        }
-        this.roomSettings[shortName] = settings;
-    }
-    static checkMissing() {
-        for (const rName in this.roomSettings) {
-            this.roomSettings[rName].checkMissing();
-        }
-    }
-    addToCorrectRoom() {
-        const settings = HmIPDevice.roomSettings[this.info.room];
-        if (settings !== undefined) {
-            if (settings.devices[this.deviceType] === undefined) {
-                log_service_1.ServerLogService.missingRoomHandling(settings.RoomName, this.deviceType);
-                return;
-            }
-            const deviceSettings = settings.devices[this.deviceType][this.info.deviceRoomIndex];
-            if (deviceSettings === undefined) {
-                log_service_1.ServerLogService.missingRoomIndexHandling(settings.RoomName, this.info.deviceRoomIndex, this.deviceType);
-                return;
-            }
-            if (deviceSettings.customName !== undefined) {
-                this.info.customName = deviceSettings.customName;
-            }
-            deviceSettings.setID(this.info.devID);
-            deviceSettings.added = true;
-            log_service_1.ServerLogService.addedDeviceToRoom(settings.RoomName, this.deviceType, this.info.deviceRoomIndex);
-            return;
-        }
-        switch (this.info.room) {
+    static createRespectiveDevice(hmIPInfo) {
+        let d;
+        switch (hmIPInfo.deviceType) {
+            case 'Lampe':
+                d = new index_1.HmIpLampe(hmIPInfo);
+                break;
+            case 'Roll':
+            case 'Broll':
+                d = new index_1.HmIpRoll(hmIPInfo);
+                break;
+            case 'Beweg':
+                d = new index_1.HmIpBewegung(hmIPInfo);
+                break;
+            case 'Taster':
+                d = new index_1.HmIpTaster(hmIPInfo);
+                break;
+            case 'Wippe':
+                d = new index_1.HmIpWippe(hmIPInfo);
+                break;
+            case 'Praezenz':
+                d = new index_1.HmIpPraezenz(hmIPInfo);
+                break;
+            case 'Griff':
+                d = new index_1.HmIpGriff(hmIPInfo);
+                break;
+            case 'Thermostat':
+                d = new index_1.HmIpTherm(hmIPInfo);
+                break;
+            case 'Heizung':
+                d = new index_1.HmIpHeizung(hmIPInfo);
+                break;
+            case 'Tuer':
+                d = new index_1.HmIpTuer(hmIPInfo);
+                break;
+            case 'HeizGr':
+                d = new index_1.HmIpHeizgruppe(hmIPInfo);
+                break;
             default:
-                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `${this.info.room} is noch kein bekannter Raum`);
+                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `No HmIP Device Type for ${hmIPInfo.deviceType} defined`);
+                d = new HmIPDevice(hmIPInfo, deviceType_1.DeviceType.unknown);
         }
+        return d;
     }
     update(idSplit, state, initial = false, pOverride = false) {
         if (!pOverride) {
@@ -69,4 +75,3 @@ class HmIPDevice extends iIoBrokerDevice_1.ioBrokerBaseDevice {
     }
 }
 exports.HmIPDevice = HmIPDevice;
-HmIPDevice.roomSettings = {};

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

@@ -4,14 +4,14 @@ exports.HmIpGriff = void 0;
 const logLevel_1 = require("../../../models/logLevel");
 const FensterPosition_1 = require("./FensterPosition");
 const hmIpDevice_1 = require("./hmIpDevice");
-const hmIpDeviceType_1 = require("./hmIpDeviceType");
+const deviceType_1 = require("../deviceType");
 const log_service_1 = require("../../services/log-service");
 const telegram_service_1 = require("../../services/Telegram/telegram-service");
 const utils_1 = require("../../services/utils/utils");
 const weather_service_1 = require("../../services/weather/weather-service");
 class HmIpGriff extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
-        super(pInfo, hmIpDeviceType_1.HmIpDeviceType.HmIpGriff);
+        super(pInfo, deviceType_1.DeviceType.HmIpGriff);
         this.position = FensterPosition_1.FensterPosition.geschlossen;
         this._kippCallback = [];
         this._closedCallback = [];

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

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpHeizgruppe = void 0;
 const logLevel_1 = require("../../../models/logLevel");
 const hmIpDevice_1 = require("./hmIpDevice");
-const hmIpDeviceType_1 = require("./hmIpDeviceType");
+const deviceType_1 = require("../deviceType");
 const log_service_1 = require("../../services/log-service");
 const persist_1 = require("../../services/dbo/persist");
 const devices_1 = require("../devices");
 const utils_1 = require("../../services/utils/utils");
 class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
-        super(pInfo, hmIpDeviceType_1.HmIpDeviceType.HmIpHeizgruppe);
+        super(pInfo, deviceType_1.DeviceType.HmIpHeizgruppe);
         this._automaticMode = true;
         this._level = 0;
         this._temperatur = 0;
@@ -74,9 +74,9 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     }
     getBelongingHeizungen() {
         const result = [];
-        for (const dID in devices_1.Devices.hmIP) {
-            const d = devices_1.Devices.hmIP[dID];
-            if (d.deviceType === hmIpDeviceType_1.HmIpDeviceType.HmIpHeizung && d.info.room === this.info.room) {
+        for (const dID in devices_1.Devices.alLDevices) {
+            const d = devices_1.Devices.alLDevices[dID];
+            if (d.deviceType === deviceType_1.DeviceType.HmIpHeizung && d.info.room === this.info.room) {
                 result.push(d);
             }
         }

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

@@ -4,10 +4,10 @@ exports.HmIpHeizung = void 0;
 const logLevel_1 = require("../../../models/logLevel");
 const log_service_1 = require("../../services/log-service");
 const hmIpDevice_1 = require("./hmIpDevice");
-const hmIpDeviceType_1 = require("./hmIpDeviceType");
+const deviceType_1 = require("../deviceType");
 class HmIpHeizung extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
-        super(pInfo, hmIpDeviceType_1.HmIpDeviceType.HmIpHeizung);
+        super(pInfo, deviceType_1.DeviceType.HmIpHeizung);
         this._temperatur = 0;
         this._level = 0;
         this._desiredTemperatur = 0;

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

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpLampe = void 0;
 const logLevel_1 = require("../../../models/logLevel");
 const hmIpDevice_1 = require("./hmIpDevice");
-const hmIpDeviceType_1 = require("./hmIpDeviceType");
+const deviceType_1 = require("../deviceType");
 const log_service_1 = require("../../services/log-service");
 const actuatorSettings_1 = require("../../../models/actuatorSettings");
 const utils_1 = require("../../services/utils/utils");
 class HmIpLampe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
-        super(pInfo, hmIpDeviceType_1.HmIpDeviceType.HmIpLampe);
+        super(pInfo, deviceType_1.DeviceType.HmIpLampe);
         this.lightOn = false;
         this.queuedLightValue = null;
         this.isStromStoss = false;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpPraezenz = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
-const hmIpDeviceType_1 = require("./hmIpDeviceType");
+const deviceType_1 = require("../deviceType");
 const logLevel_1 = require("../../../models/logLevel");
 const log_service_1 = require("../../services/log-service");
 const persist_1 = require("../../services/dbo/persist");
@@ -10,7 +10,7 @@ const utils_1 = require("../../services/utils/utils");
 const CurrentIlluminationDataPoint_1 = require("../../../models/persistence/CurrentIlluminationDataPoint");
 class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
-        super(pInfo, hmIpDeviceType_1.HmIpDeviceType.HmIpPraezenz);
+        super(pInfo, deviceType_1.DeviceType.HmIpPraezenz);
         this.excludeFromNightAlarm = false;
         this.presenceDetected = false;
         this._detectionsToday = 0;

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

@@ -4,12 +4,12 @@ exports.HmIpRoll = void 0;
 const logLevel_1 = require("../../../models/logLevel");
 const FensterPosition_1 = require("./FensterPosition");
 const hmIpDevice_1 = require("./hmIpDevice");
-const hmIpDeviceType_1 = require("./hmIpDeviceType");
+const deviceType_1 = require("../deviceType");
 const log_service_1 = require("../../services/log-service");
 const utils_1 = require("../../services/utils/utils");
 class HmIpRoll extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
-        super(pInfo, hmIpDeviceType_1.HmIpDeviceType.HmIpRoll);
+        super(pInfo, deviceType_1.DeviceType.HmIpRoll);
         this._currentLevel = -1;
         this._firstCommandRecieved = false;
         this._setLevel = -1;

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

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpTaster = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
-const hmIpDeviceType_1 = require("./hmIpDeviceType");
+const deviceType_1 = require("../deviceType");
 const taste_1 = require("../taste");
 const logLevel_1 = require("../../../models/logLevel");
 const log_service_1 = require("../../services/log-service");
 class HmIpTaster extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
-        super(pInfo, hmIpDeviceType_1.HmIpDeviceType.HmIpTaster);
+        super(pInfo, deviceType_1.DeviceType.HmIpTaster);
         this.tasten = {
             ObenLinks: new taste_1.Taste(1),
             ObenRechts: new taste_1.Taste(2),

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

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpTherm = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
-const hmIpDeviceType_1 = require("./hmIpDeviceType");
+const deviceType_1 = require("../deviceType");
 const logLevel_1 = require("../../../models/logLevel");
 const log_service_1 = require("../../services/log-service");
 class HmIpTherm extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
-        super(pInfo, hmIpDeviceType_1.HmIpDeviceType.HmIpTherm);
+        super(pInfo, deviceType_1.DeviceType.HmIpTherm);
     }
     update(idSplit, state, initial = false) {
         log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Trace, `Thermostat "${this.info.customName}" Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpTuer = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
-const hmIpDeviceType_1 = require("./hmIpDeviceType");
+const deviceType_1 = require("../deviceType");
 const logLevel_1 = require("../../../models/logLevel");
 const log_service_1 = require("../../services/log-service");
 const TuerPosition_1 = require("./TuerPosition");
@@ -11,7 +11,7 @@ const telegram_service_1 = require("../../services/Telegram/telegram-service");
 const utils_1 = require("../../services/utils/utils");
 class HmIpTuer extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
-        super(pInfo, hmIpDeviceType_1.HmIpDeviceType.HmIpTuer);
+        super(pInfo, deviceType_1.DeviceType.HmIpTuer);
         this.position = TuerPosition_1.TuerPosition.geschlossen;
         this._closedCallback = [];
         this._offenCallback = [];

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

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpWippe = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
-const hmIpDeviceType_1 = require("./hmIpDeviceType");
+const deviceType_1 = require("../deviceType");
 const taste_1 = require("../taste");
 const logLevel_1 = require("../../../models/logLevel");
 const log_service_1 = require("../../services/log-service");
 class HmIpWippe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
-        super(pInfo, hmIpDeviceType_1.HmIpDeviceType.HmIpWippe);
+        super(pInfo, deviceType_1.DeviceType.HmIpWippe);
         this.tasten = {
             Unten: new taste_1.Taste(1),
             Oben: new taste_1.Taste(2),

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

@@ -11,6 +11,6 @@ export * from './hmIpHeizung';
 export * from './hmIpBewegung';
 export * from './hmIpPraezenz';
 export * from './TuerPosition';
-export * from './hmIpDeviceType';
+export * from '../deviceType';
 export * from './hmIpHeizgruppe';
 export * from './FensterPosition';

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

@@ -23,6 +23,6 @@ __exportStar(require("./hmIpHeizung"), exports);
 __exportStar(require("./hmIpBewegung"), exports);
 __exportStar(require("./hmIpPraezenz"), exports);
 __exportStar(require("./TuerPosition"), exports);
-__exportStar(require("./hmIpDeviceType"), exports);
+__exportStar(require("../deviceType"), exports);
 __exportStar(require("./hmIpHeizgruppe"), exports);
 __exportStar(require("./FensterPosition"), exports);

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

@@ -3,13 +3,14 @@ export * from './taste';
 export * from './Griffe';
 export * from './Rollos';
 export * from './devices';
+export * from './deviceType';
 export * from './iTaster';
 export * from './DeviceInfo';
 export * from './wledDevice';
 export * from './Heizgruppen';
 export * from './deviceUpdater';
 export * from './iDeviceUpdater';
-export * from './iIoBrokerDevice';
+export * from './IoBrokerBaseDevice';
 export * from './iIlluminationSensor';
 export * from './groups/index';
 export * from './hmIPDevices/index';

package/lib/server/devices/index.js

@@ -15,13 +15,14 @@ __exportStar(require("./taste"), exports);
 __exportStar(require("./Griffe"), exports);
 __exportStar(require("./Rollos"), exports);
 __exportStar(require("./devices"), exports);
+__exportStar(require("./deviceType"), exports);
 __exportStar(require("./iTaster"), exports);
 __exportStar(require("./DeviceInfo"), exports);
 __exportStar(require("./wledDevice"), exports);
 __exportStar(require("./Heizgruppen"), exports);
 __exportStar(require("./deviceUpdater"), exports);
 __exportStar(require("./iDeviceUpdater"), exports);
-__exportStar(require("./iIoBrokerDevice"), exports);
+__exportStar(require("./IoBrokerBaseDevice"), exports);
 __exportStar(require("./iIlluminationSensor"), exports);
 __exportStar(require("./groups/index"), exports);
 __exportStar(require("./hmIPDevices/index"), exports);