hoffmation-base 0.1.41-1 → 0.1.41-13

package/lib/server/devices/button.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Button = exports.ButtonPressType = exports.ButtonCapabilities = void 0;
-const utils_1 = require("../services/utils/utils");
-const log_service_1 = require("../services/log-service/log-service");
-const logLevel_1 = require("../../models/logLevel");
+const services_1 = require("../services");
+const models_1 = require("../../models");
 class ButtonCapabilities {
     constructor() {
         this.shortPress = true;
@@ -55,7 +54,7 @@ class Button {
     addCb(buttonType, pCallback, description = 'Not described') {
         const cbArr = this._callbacks.get(buttonType);
         if (cbArr === undefined) {
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Error, `This Button doesn't support press Type ${ButtonPressType[buttonType]}`);
+            services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `This Button doesn't support press Type ${ButtonPressType[buttonType]}`);
             return;
         }
         cbArr.push({ cb: pCallback, description: description });
@@ -76,7 +75,7 @@ class Button {
         }
         this._state.set(type, pValue);
         if (!this._callbacks.has(type)) {
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Error, `This Button doesn't support press Type ${ButtonPressType[type]}`);
+            services_1.ServerLogService.writeLog(models_1.LogLevel.Error, `This Button doesn't support press Type ${ButtonPressType[type]}`);
             return;
         }
         for (const c of (_a = this._callbacks.get(type)) !== null && _a !== void 0 ? _a : []) {
@@ -89,7 +88,7 @@ class Button {
         if (timeout !== null) {
             clearTimeout(timeout);
         }
-        this._timeouts.set(type, utils_1.Utils.guardedTimeout(() => {
+        this._timeouts.set(type, services_1.Utils.guardedTimeout(() => {
             this.updateState(type, false);
         }, 5000, this));
     }

package/lib/server/devices/device-cluster.d.ts

@@ -1,14 +1,15 @@
 import { DeviceClusterType } from './device-cluster-type';
 import { DeviceList } from './device-list';
 import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
-import { OwnSonosDevice } from '../services/Sonos/sonos-service';
+import { OwnSonosDevice } from '../services';
+import { IBaseDevice } from './iBaseDevice';
 export declare class DeviceCluster {
     deviceMap: Map<DeviceClusterType, DeviceList>;
     constructor(deviceMap?: Map<DeviceClusterType, DeviceList>);
     getIoBrokerDevicesByType(type: DeviceClusterType): IoBrokerBaseDevice[];
-    getDevicesByType(type: DeviceClusterType): Array<IoBrokerBaseDevice | OwnSonosDevice>;
-    addByDeviceType(device: IoBrokerBaseDevice): void;
-    addToList(type: DeviceClusterType, device: IoBrokerBaseDevice): void;
+    getDevicesByType(type: DeviceClusterType): Array<IBaseDevice | OwnSonosDevice>;
+    addByDeviceType(device: IBaseDevice): void;
+    addToList(type: DeviceClusterType, device: IBaseDevice): void;
     toJSON(): Partial<DeviceCluster & {
         deviceDict?: {
             [p: string]: DeviceList;

package/lib/server/devices/device-cluster.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceCluster = void 0;
 const device_cluster_type_1 = require("./device-cluster-type");
 const device_list_1 = require("./device-list");
-const utils_1 = require("../services/utils/utils");
+const services_1 = require("../services");
 const lodash_1 = __importDefault(require("lodash"));
 const deviceType_1 = require("./deviceType");
 class DeviceCluster {
@@ -39,6 +39,7 @@ class DeviceCluster {
                 break;
             case deviceType_1.DeviceType.HmIpRoll:
             case deviceType_1.DeviceType.ZigbeeIlluShutter:
+            case deviceType_1.DeviceType.ZigbeeUbisysShutter:
                 clusterTypes.push(device_cluster_type_1.DeviceClusterType.Shutter);
                 break;
             case deviceType_1.DeviceType.ZigbeeSonoffTemp:
@@ -109,7 +110,7 @@ class DeviceCluster {
         }
     }
     toJSON() {
-        const result = utils_1.Utils.jsonFilter(this);
+        const result = services_1.Utils.jsonFilter(this);
         result.deviceDict = Object.fromEntries(this.deviceMap);
         return lodash_1.default.omit(result, [`deviceMap`]);
     }

package/lib/server/devices/device-list.d.ts

@@ -1,8 +1,8 @@
-import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
-import { OwnSonosDevice } from '../services/Sonos/sonos-service';
+import { OwnSonosDevice } from '../services';
+import { IBaseDevice } from './iBaseDevice';
 export declare class DeviceList {
     private _ids;
-    get ids(): string[];
     constructor(_ids?: string[]);
-    getDevices(): Array<IoBrokerBaseDevice | OwnSonosDevice>;
+    get ids(): string[];
+    getDevices(): Array<IBaseDevice | OwnSonosDevice>;
 }

package/lib/server/devices/device-list.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceList = void 0;
-const api_service_1 = require("../services/api/api-service");
-const OwnSonosDevices_1 = require("../services/Sonos/OwnSonosDevices");
+const services_1 = require("../services");
 class DeviceList {
     constructor(_ids = []) {
         this._ids = _ids;
+        // Empty
     }
     get ids() {
         return this._ids;
@@ -13,15 +13,15 @@ class DeviceList {
     getDevices() {
         const result = [];
         for (const dID of this._ids) {
-            const d = api_service_1.API.getDevice(dID);
+            const d = services_1.API.getDevice(dID);
             if (d !== undefined) {
                 result.push(d);
             }
         }
         for (const name of this._ids) {
-            const s = OwnSonosDevices_1.OwnSonosDevices.ownDevices[name];
+            const s = services_1.OwnSonosDevices.ownDevices[name];
             if (s !== undefined) {
-                result.push(OwnSonosDevices_1.OwnSonosDevices.ownDevices[name]);
+                result.push(services_1.OwnSonosDevices.ownDevices[name]);
             }
         }
         return result;

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

@@ -29,6 +29,7 @@ export declare enum DeviceType {
     ZigbeeAqaraMagnetContact = 215,
     ZigbeeSonoffTemp = 216,
     ZigbeeAqaraOpple3Switch = 217,
+    ZigbeeUbisysShutter = 218,
     JsEnergyManager = 301,
     Wled = 1001
 }

package/lib/server/devices/deviceType.js

@@ -33,6 +33,7 @@ var DeviceType;
     DeviceType[DeviceType["ZigbeeAqaraMagnetContact"] = 215] = "ZigbeeAqaraMagnetContact";
     DeviceType[DeviceType["ZigbeeSonoffTemp"] = 216] = "ZigbeeSonoffTemp";
     DeviceType[DeviceType["ZigbeeAqaraOpple3Switch"] = 217] = "ZigbeeAqaraOpple3Switch";
+    DeviceType[DeviceType["ZigbeeUbisysShutter"] = 218] = "ZigbeeUbisysShutter";
     DeviceType[DeviceType["JsEnergyManager"] = 301] = "JsEnergyManager";
     DeviceType[DeviceType["Wled"] = 1001] = "Wled";
 })(DeviceType = exports.DeviceType || (exports.DeviceType = {}));

package/lib/server/devices/deviceUpdater.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceUpdater = void 0;
-const log_service_1 = require("../services/log-service/log-service");
-const logLevel_1 = require("../../models/logLevel");
+const services_1 = require("../services");
+const models_1 = require("../../models");
 const devices_1 = require("./devices");
 class DeviceUpdater {
     constructor(pDevices) {
@@ -25,14 +25,14 @@ class DeviceUpdater {
         if (idSplit.length < 2)
             return;
         const device = devices_1.Devices.alLDevices[`${idSplit[0]}-${idSplit[2]}`];
-        if (typeof device === 'undefined') {
+        if (typeof device === 'undefined' || device.update === undefined) {
             return;
         }
         try {
             device.update(idSplit, state, initial, false);
         }
         catch (e) {
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Alert, `deviceUpdater.updateState('${id}', '${state}'): Error occured updating Device: ${e} \n ${e.stack}`);
+            services_1.ServerLogService.writeLog(models_1.LogLevel.Alert, `deviceUpdater.updateState('${id}', '${state}'): Error occured updating Device: ${e} \n ${e.stack}`);
         }
     }
 }

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

@@ -1,13 +1,12 @@
-import { deviceConfig } from '../../models/deviceConfig';
-import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
-import { iRoomImportEnforcer } from '../../models/rooms/iRoomImportEnforcer';
+import { deviceConfig, iRoomImportEnforcer } from '../../models';
 import { iEnergyManager } from './iEnergyManager';
+import { IBaseDevice } from './iBaseDevice';
 export declare class Devices {
     static IDENTIFIER_HOMEMATIC: string;
     static IDENTIFIER_JS: string;
     static IDENTIFIER_ZIGBEE: string;
     static alLDevices: {
-        [id: string]: IoBrokerBaseDevice;
+        [id: string]: IBaseDevice;
     };
     static energymanager?: iEnergyManager;
     constructor(pDeviceData: {
@@ -15,8 +14,8 @@ export declare class Devices {
     }, pRoomImportEnforcer?: iRoomImportEnforcer);
     static midnightReset(): void;
     static resetPraesenzCount(): void;
-    private processZigbeeDevice;
-    private processHMIPDevice;
     static getBatteryInfo(): string;
-    private createEnergyManager;
+    private static processZigbeeDevice;
+    private static processHMIPDevice;
+    private static createEnergyManager;
 }

package/lib/server/devices/devices.js

@@ -1,46 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Devices = void 0;
-const hmIpDevice_1 = require("./hmIPDevices/hmIpDevice");
-const zigbeeDevice_1 = require("./zigbee/zigbeeDevice");
+const models_1 = require("../../models");
+const hmIPDevices_1 = require("./hmIPDevices");
+const zigbee_1 = require("./zigbee");
 const deviceType_1 = require("./deviceType");
-const hmIpPraezenz_1 = require("./hmIPDevices/hmIpPraezenz");
-const log_service_1 = require("../services/log-service/log-service");
+const services_1 = require("../services");
 const DeviceInfo_1 = require("./DeviceInfo");
-const logLevel_1 = require("../../models/logLevel");
-const hmIpBewegung_1 = require("./hmIPDevices/hmIpBewegung");
-const zigbeeAquaraVibra_1 = require("./zigbee/zigbeeAquaraVibra");
-const zigbeeAquaraMotion_1 = require("./zigbee/zigbeeAquaraMotion");
-const zigbeeIkeaSteckdose_1 = require("./zigbee/zigbeeIkeaSteckdose");
-const zigbeeIlluLedRGBCCT_1 = require("./zigbee/zigbeeIlluLedRGBCCT");
-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 hmIpLampe_1 = require("./hmIPDevices/hmIpLampe");
-const hmIpRoll_1 = require("./hmIPDevices/hmIpRoll");
-const hmIpTaster_1 = require("./hmIPDevices/hmIpTaster");
-const hmIpWippe_1 = require("./hmIPDevices/hmIpWippe");
-const hmIpGriff_1 = require("./hmIPDevices/hmIpGriff");
-const hmIpTherm_1 = require("./hmIPDevices/hmIpTherm");
-const hmIpHeizung_1 = require("./hmIPDevices/hmIpHeizung");
-const hmIpTuer_1 = require("./hmIPDevices/hmIpTuer");
-const hmIpHeizgruppe_1 = require("./hmIPDevices/hmIpHeizgruppe");
-const zigbeeIlluShutter_1 = require("./zigbee/zigbeeIlluShutter");
-const zigbeeSMaBiTMagnetContact_1 = require("./zigbee/zigbeeSMaBiTMagnetContact");
-const zigbeeSonoffMotion_1 = require("./zigbee/zigbeeSonoffMotion");
-const hmIpAccessPoint_1 = require("./hmIPDevices/hmIpAccessPoint");
-const zigbeeAqaraMagnetContact_1 = require("./zigbee/zigbeeAqaraMagnetContact");
-const zigbeeSonoffTemp_1 = require("./zigbee/zigbeeSonoffTemp");
-const zigbeeAqaraOpple3Switch_1 = require("./zigbee/zigbeeAqaraOpple3Switch");
-const jsObjectEnergyManager_1 = require("./jsObject/jsObjectEnergyManager");
+const jsObject_1 = require("./jsObject");
 class Devices {
     constructor(pDeviceData, pRoomImportEnforcer) {
         // This forces import of rooms at correct timing, to allow devices to land in proper rooms.
         pRoomImportEnforcer === null || pRoomImportEnforcer === void 0 ? void 0 : pRoomImportEnforcer.addRoomConstructor();
-        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Constructing devices now`);
+        services_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Constructing devices now`);
         for (const cID in pDeviceData) {
             const cDevConf = pDeviceData[cID];
             if (!cDevConf.common ||
@@ -52,182 +24,180 @@ class Devices {
             }
             const cName = cDevConf.common.name;
             if (cName.indexOf('00-HmIP') === 0) {
-                this.processHMIPDevice(cDevConf);
+                Devices.processHMIPDevice(cDevConf);
             }
             else if (cName.indexOf('00-Zigbee') === 0) {
-                this.processZigbeeDevice(cDevConf);
+                Devices.processZigbeeDevice(cDevConf);
             }
             else if (cName.indexOf('00-EnergyManager') === 0) {
-                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Found Energy-Manager in Device json.`);
-                this.createEnergyManager(cDevConf);
+                services_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Found Energy-Manager in Device json.`);
+                Devices.createEnergyManager(cDevConf);
             }
         }
-        hmIpDevice_1.HmIPDevice.checkMissing();
-        zigbeeDevice_1.ZigbeeDevice.checkMissing();
+        hmIPDevices_1.HmIPDevice.checkMissing();
+        zigbee_1.ZigbeeDevice.checkMissing();
     }
     static midnightReset() {
         // Nothing yet
     }
     static resetPraesenzCount() {
-        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `3 Uhr Reset der Präsenzmelder`);
+        services_1.ServerLogService.writeLog(models_1.LogLevel.Info, `3 Uhr Reset der Präsenzmelder`);
         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}`);
+            if (d.deviceType === deviceType_1.DeviceType.HmIpPraezenz ||
+                d.deviceType === deviceType_1.DeviceType.HmIpBewegung ||
+                d.deviceType === deviceType_1.DeviceType.ZigbeeSonoffMotion ||
+                d.deviceType === deviceType_1.DeviceType.ZigbeeAquaraMotion) {
+                services_1.ServerLogService.writeLog(models_1.LogLevel.Debug, `2 Uhr Reset der Tages Detektionen von ${d.info.customName}`);
                 d.detectionsToday = 0;
             }
-            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;
-            }
-            else if (d.deviceType === deviceType_1.DeviceType.ZigbeeSonoffMotion || d.deviceType === deviceType_1.DeviceType.ZigbeeAquaraMotion) {
-                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Debug, `2 Uhr Reset der Tages Detektionen von ${d.info.customName}`);
-                d.detectionsToday = 0;
+        }
+    }
+    static getBatteryInfo() {
+        services_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Getting Battery Info`);
+        let data = [];
+        const result = [
+            `These are the battery values for each device. Device dependandt some are in volts, some in %`,
+        ];
+        for (const key in this.alLDevices) {
+            const d = this.alLDevices[key];
+            if (d.battery !== undefined) {
+                data.push({ name: d.info.customName, amount: d.battery });
             }
         }
+        data = data.sort((a, b) => {
+            return a.amount - b.amount;
+        });
+        for (let i = 0; i < data.length; i++) {
+            result.push(`${data[i].amount}\t${data[i].name}`);
+        }
+        return result.join('\n');
     }
-    processZigbeeDevice(cDevConf) {
+    static processZigbeeDevice(cDevConf) {
         const zigbeeInfo = new DeviceInfo_1.DeviceInfo(cDevConf);
         const fullName = `${Devices.IDENTIFIER_ZIGBEE}-${zigbeeInfo.devID}`;
         zigbeeInfo.allDevicesKey = fullName;
         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`);
+        services_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `${zigbeeInfo.devID} with Type "${zigbeeInfo.deviceType}" doesn't exists --> create it`);
         let d;
         switch (zigbeeInfo.deviceType) {
             case 'AqaraMagnetContact':
-                d = new zigbeeAqaraMagnetContact_1.ZigbeeAqaraMagnetContact(zigbeeInfo);
+                d = new zigbee_1.ZigbeeAqaraMagnetContact(zigbeeInfo);
                 break;
             case 'AqaraOpple3Switch':
-                d = new zigbeeAqaraOpple3Switch_1.ZigbeeAqaraOpple3Switch(zigbeeInfo);
+                d = new zigbee_1.ZigbeeAqaraOpple3Switch(zigbeeInfo);
                 break;
             case 'AquaraMotion':
-                d = new zigbeeAquaraMotion_1.ZigbeeAquaraMotion(zigbeeInfo);
+                d = new zigbee_1.ZigbeeAquaraMotion(zigbeeInfo);
                 break;
             case 'AquaraVibra':
-                d = new zigbeeAquaraVibra_1.ZigbeeAquaraVibra(zigbeeInfo);
+                d = new zigbee_1.ZigbeeAquaraVibra(zigbeeInfo);
                 break;
             case 'AquaraWater':
-                d = new zigbeeAquaraWater_1.ZigbeeAquaraWater(zigbeeInfo);
+                d = new zigbee_1.ZigbeeAquaraWater(zigbeeInfo);
                 break;
             case 'BlitzShp':
-                d = new zigbeeBlitzShp_1.ZigbeeBlitzShp(zigbeeInfo);
+                d = new zigbee_1.ZigbeeBlitzShp(zigbeeInfo);
                 break;
             case 'HeimanSmoke':
-                d = new zigbeeHeimanSmoke_1.ZigbeeHeimanSmoke(zigbeeInfo);
+                d = new zigbee_1.ZigbeeHeimanSmoke(zigbeeInfo);
                 break;
             case 'IkeaStecker':
-                d = new zigbeeIkeaSteckdose_1.ZigbeeIkeaSteckdose(zigbeeInfo);
+                d = new zigbee_1.ZigbeeIkeaSteckdose(zigbeeInfo);
                 break;
             case 'IlluActuator':
-                d = new zigbeeIlluActuator_1.ZigbeeIlluActuator(zigbeeInfo);
+                d = new zigbee_1.ZigbeeIlluActuator(zigbeeInfo);
                 break;
             case 'IlluDimmer':
-                d = new zigbeeIlluDimmer_1.ZigbeeIlluDimmer(zigbeeInfo);
+                d = new zigbee_1.ZigbeeIlluDimmer(zigbeeInfo);
                 break;
             case 'IlluLampe':
-                d = new zigbeeIlluLampe_1.ZigbeeIlluLampe(zigbeeInfo);
+                d = new zigbee_1.ZigbeeIlluLampe(zigbeeInfo);
                 break;
             case 'IlluShutter':
-                d = new zigbeeIlluShutter_1.ZigbeeIlluShutter(zigbeeInfo);
+                d = new zigbee_1.ZigbeeIlluShutter(zigbeeInfo);
                 break;
             case 'LedRGBCCT':
-                d = new zigbeeIlluLedRGBCCT_1.ZigbeeIlluLedRGBCCT(zigbeeInfo);
+                d = new zigbee_1.ZigbeeIlluLedRGBCCT(zigbeeInfo);
                 break;
             case 'SMaBiTMagnet':
-                d = new zigbeeSMaBiTMagnetContact_1.ZigbeeSMaBiTMagnetContact(zigbeeInfo);
+                d = new zigbee_1.ZigbeeSMaBiTMagnetContact(zigbeeInfo);
                 break;
             case 'SonoffMotion':
-                d = new zigbeeSonoffMotion_1.ZigbeeSonoffMotion(zigbeeInfo);
+                d = new zigbee_1.ZigbeeSonoffMotion(zigbeeInfo);
                 break;
             case 'SonoffTemp':
-                d = new zigbeeSonoffTemp_1.ZigbeeSonoffTemp(zigbeeInfo);
+                d = new zigbee_1.ZigbeeSonoffTemp(zigbeeInfo);
+                break;
+            case 'UbisysShutter':
+                d = new zigbee_1.ZigbeeUbisysShutter(zigbeeInfo);
                 break;
             default:
-                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `No zigbee Device Type for ${zigbeeInfo.deviceType} defined`);
-                d = new zigbeeDevice_1.ZigbeeDevice(zigbeeInfo, deviceType_1.DeviceType.unknown);
+                services_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `No zigbee Device Type for ${zigbeeInfo.deviceType} defined`);
+                d = new zigbee_1.ZigbeeDevice(zigbeeInfo, deviceType_1.DeviceType.unknown);
         }
         Devices.alLDevices[fullName] = d;
     }
-    processHMIPDevice(cDevConf) {
+    static processHMIPDevice(cDevConf) {
         const hmIPInfo = new DeviceInfo_1.DeviceInfo(cDevConf);
         const fullName = `${Devices.IDENTIFIER_HOMEMATIC}-${hmIPInfo.devID}`;
         hmIPInfo.allDevicesKey = fullName;
         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`);
+        services_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `${hmIPInfo.devID} with Type "${hmIPInfo.deviceType}" doesn't exists --> create it`);
         let d;
         switch (hmIPInfo.deviceType) {
             case 'Lampe':
-                d = new hmIpLampe_1.HmIpLampe(hmIPInfo);
+                d = new hmIPDevices_1.HmIpLampe(hmIPInfo);
                 break;
             case 'Roll':
             case 'Broll':
-                d = new hmIpRoll_1.HmIpRoll(hmIPInfo);
+                d = new hmIPDevices_1.HmIpRoll(hmIPInfo);
                 break;
             case 'Beweg':
-                d = new hmIpBewegung_1.HmIpBewegung(hmIPInfo);
+                d = new hmIPDevices_1.HmIpBewegung(hmIPInfo);
                 break;
             case 'Taster':
-                d = new hmIpTaster_1.HmIpTaster(hmIPInfo);
+                d = new hmIPDevices_1.HmIpTaster(hmIPInfo);
                 break;
             case 'Wippe':
-                d = new hmIpWippe_1.HmIpWippe(hmIPInfo);
+                d = new hmIPDevices_1.HmIpWippe(hmIPInfo);
                 break;
             case 'Praezenz':
-                d = new hmIpPraezenz_1.HmIpPraezenz(hmIPInfo);
+                d = new hmIPDevices_1.HmIpPraezenz(hmIPInfo);
                 break;
             case 'Griff':
-                d = new hmIpGriff_1.HmIpGriff(hmIPInfo);
+                d = new hmIPDevices_1.HmIpGriff(hmIPInfo);
                 break;
             case 'Thermostat':
-                d = new hmIpTherm_1.HmIpTherm(hmIPInfo);
+                d = new hmIPDevices_1.HmIpTherm(hmIPInfo);
                 break;
             case 'Heizung':
-                d = new hmIpHeizung_1.HmIpHeizung(hmIPInfo);
+                d = new hmIPDevices_1.HmIpHeizung(hmIPInfo);
                 break;
             case 'Tuer':
-                d = new hmIpTuer_1.HmIpTuer(hmIPInfo);
+                d = new hmIPDevices_1.HmIpTuer(hmIPInfo);
                 break;
             case 'HeizGr':
-                d = new hmIpHeizgruppe_1.HmIpHeizgruppe(hmIPInfo);
+                d = new hmIPDevices_1.HmIpHeizgruppe(hmIPInfo);
                 break;
             case 'AccessPoint':
-                d = new hmIpAccessPoint_1.HmIpAccessPoint(hmIPInfo);
+                d = new hmIPDevices_1.HmIpAccessPoint(hmIPInfo);
                 break;
             default:
-                log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `No HmIP Device Type for ${hmIPInfo.deviceType} defined`);
-                d = new hmIpDevice_1.HmIPDevice(hmIPInfo, deviceType_1.DeviceType.unknown);
+                services_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `No HmIP Device Type for ${hmIPInfo.deviceType} defined`);
+                d = new hmIPDevices_1.HmIPDevice(hmIPInfo, deviceType_1.DeviceType.unknown);
         }
         Devices.alLDevices[fullName] = d;
     }
-    static getBatteryInfo() {
-        log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Info, `Getting Battery Info`);
-        let data = [];
-        const result = [
-            `These are the battery values for each device. Device dependandt some are in volts, some in %`,
-        ];
-        for (const key in this.alLDevices) {
-            const d = this.alLDevices[key];
-            if (d.battery !== undefined) {
-                data.push({ name: d.info.customName, amount: d.battery });
-            }
-        }
-        data = data.sort((a, b) => {
-            return a.amount - b.amount;
-        });
-        for (let i = 0; i < data.length; i++) {
-            result.push(`${data[i].amount}\t${data[i].name}`);
-        }
-        return result.join('\n');
-    }
-    createEnergyManager(cDevConf) {
+    static createEnergyManager(cDevConf) {
         const devInfo = new DeviceInfo_1.DeviceInfo(cDevConf, true);
         const fullName = `${Devices.IDENTIFIER_JS}-${devInfo.devID}`;
         devInfo.allDevicesKey = fullName;
-        Devices.energymanager = new jsObjectEnergyManager_1.JsObjectEnergyManager(devInfo);
+        Devices.energymanager = new jsObject_1.JsObjectEnergyManager(devInfo);
         Devices.alLDevices[fullName] = Devices.energymanager;
     }
 }

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

@@ -1,22 +1,22 @@
-import { HmIpGriff } from '../hmIPDevices/hmIpGriff';
-import { ZigbeeAquaraVibra } from '../zigbee/zigbeeAquaraVibra';
-import { FensterPosition } from '../models/FensterPosition';
+import { HmIpGriff } from '../hmIPDevices';
+import { FensterPosition } from '../models';
 import { iShutter } from '../iShutter';
 import { BaseGroup } from './base-group';
-import { ZigbeeMagnetContact } from '../zigbee/zigbeeMagnetContact';
+import { ZigbeeMagnetContact } from '../zigbee';
+import { iVibrationSensor } from '../iVibrationSensor';
 export declare class Fenster extends BaseGroup {
     noRolloOnSunrise: boolean;
     desiredPosition: number;
+    constructor(roomName: string, handleIds?: string[], vibrationIds?: string[], shutterIds?: string[], magnetIds?: string[], noRolloOnSunrise?: boolean);
     /**
      * sets the desired Pos and moves rollo to this level
      * @param {number} value
      */
     setDesiredPosition(value: number): void;
-    constructor(roomName: string, handleIds?: string[], vibrationIds?: string[], shutterIds?: string[], magnetIds?: string[], noRolloOnSunrise?: boolean);
     getHandle(): HmIpGriff[];
     getMagnetContact(): ZigbeeMagnetContact[];
     getShutter(): iShutter[];
-    getVibration(): ZigbeeAquaraVibra[];
+    getVibration(): iVibrationSensor[];
     griffeInPosition(pPosition: FensterPosition): number;
     initialize(): void;
     rolloPositionChange(pValue: number): void;