hoffmation-base 1.0.35 → 1.0.38

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

@@ -1,23 +1,7 @@
-import { deviceConfig } from '../../models';
 export declare class DeviceInfo {
-    devID: string;
-    room: string;
-    deviceType: string;
-    deviceRoomIndex: number;
-    type: 'device' | 'channel' | 'state';
     fullName: string;
-    fullID: string;
-    channel?: number;
-    valueName?: string;
-    devConf: deviceConfig;
+    room: string;
     allDevicesKey?: string;
-    /**
-     * Extracts the relevant infos from the passed deviceConfig and combines them in a new Info object
-     * @param {deviceConfig} pDevConf The device Config based on the extracted devices.json from ioBroker
-     * @param {boolean} isJsStateChildObject Within JS Objects, creating devices is limited,
-     * so we name the first child state for the object creation (e.g. javascript.0.00-EnergyManager.CurrentProduction)
-     */
-    constructor(pDevConf: deviceConfig, isJsStateChildObject?: boolean);
     private _customName?;
     get customName(): string;
     set customName(val: string);

package/lib/server/devices/DeviceInfo.js

@@ -1,65 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceInfo = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 class DeviceInfo {
-    /**
-     * Extracts the relevant infos from the passed deviceConfig and combines them in a new Info object
-     * @param {deviceConfig} pDevConf The device Config based on the extracted devices.json from ioBroker
-     * @param {boolean} isJsStateChildObject Within JS Objects, creating devices is limited,
-     * so we name the first child state for the object creation (e.g. javascript.0.00-EnergyManager.CurrentProduction)
-     */
-    constructor(pDevConf, isJsStateChildObject = false) {
-        this.devConf = pDevConf;
-        this.type = pDevConf.type;
-        const idSplit = pDevConf._id.split('.');
-        this.fullID = pDevConf._id;
-        this.devID = idSplit[2];
-        this.fullName = pDevConf.common.name;
-        const nameSplit = pDevConf.common.name.split('-');
-        if (!isJsStateChildObject) {
-            /**
-             * 0: hm-rpc
-             * 1: rcpInstance
-             * 2: Device ID
-             * 3?: Channel
-             * 4?: ValueName
-             */
-            if (idSplit.length > 3) {
-                this.channel = Number(idSplit[3]);
-            }
-            if (idSplit.length > 4) {
-                this.valueName = idSplit[4];
-            }
-            /** Name-Split
-             * 0: Indikator own "00"
-             * 1: "HmIP"
-             * 2: Raum
-             * 3: Was für ein Gerät
-             * 4: Index dieses Gerätes im Raum (ggf. + :Channel)
-             * 5?: Name des Wertes
-             */
-            this.room = nameSplit[2];
-            this.deviceType = nameSplit[3];
-            this.deviceRoomIndex = Number(nameSplit[4].split(':')[0]);
-            return;
-        }
-        else {
-            /** Name-Split
-             * 0: Indikator own "00"
-             * 1: "EnergyManager"
-             * 2: Raum
-             * 3: Was für ein Gerät
-             * 4: Index dieses Gerätes im Raum (ggf. + :Channel)
-             * 5?: Name des Wertes
-             */
-            this.deviceType = nameSplit[1];
-            this.room = nameSplit.length >= 3 ? nameSplit[2] : '';
-            this.deviceRoomIndex = nameSplit.length >= 4 ? Number(nameSplit[3]) : 0;
-        }
+    constructor() {
+        this.fullName = '';
+        this.room = '';
     }
     get customName() {
         if (this._customName !== undefined) {
@@ -71,7 +16,7 @@ class DeviceInfo {
         this._customName = val;
     }
     toJSON() {
-        return lodash_1.default.omit(this, ['devConf']);
+        return this;
     }
 }
 exports.DeviceInfo = DeviceInfo;

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

@@ -1,30 +1,30 @@
 /// <reference types="iobroker" />
 import { IBaseDevice } from './baseDeviceInterfaces';
 import { LogDebugType } from '../services';
-import { DeviceInfo } from './DeviceInfo';
 import { LogLevel, RoomBase, RoomDeviceAddingSettings } from '../../models';
 import { IOBrokerConnection } from '../ioBroker';
 import { DeviceType } from './deviceType';
+import { IoBrokerDeviceInfo } from './IoBrokerDeviceInfo';
 export declare abstract class IoBrokerBaseDevice implements IBaseDevice {
-    protected _info: DeviceInfo;
+    protected _info: IoBrokerDeviceInfo;
     deviceType: DeviceType;
     static roomAddingSettings: {
         [id: string]: RoomDeviceAddingSettings;
     };
     room: RoomBase | undefined;
     battery: number | undefined;
-    protected constructor(_info: DeviceInfo, deviceType: DeviceType);
+    protected constructor(_info: IoBrokerDeviceInfo, deviceType: DeviceType);
     get id(): string;
     /**
      * Getter info
-     * @return {DeviceInfo}
+     * @return {IoBrokerDeviceInfo}
      */
-    get info(): DeviceInfo;
+    get info(): IoBrokerDeviceInfo;
     /**
      * Setter info
-     * @param {DeviceInfo} value
+     * @param {IoBrokerDeviceInfo} value
      */
-    set info(value: DeviceInfo);
+    set info(value: IoBrokerDeviceInfo);
     /**
      * Getter ioConn
      * @return {IOBrokerConnection}

package/lib/server/devices/IoBrokerBaseDevice.js

@@ -20,14 +20,14 @@ class IoBrokerBaseDevice {
     }
     /**
      * Getter info
-     * @return {DeviceInfo}
+     * @return {IoBrokerDeviceInfo}
      */
     get info() {
         return this._info;
     }
     /**
      * Setter info
-     * @param {DeviceInfo} value
+     * @param {IoBrokerDeviceInfo} value
      */
     set info(value) {
         this._info = value;

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

@@ -0,0 +1,20 @@
+import { deviceConfig } from '../../models';
+import { DeviceInfo } from './DeviceInfo';
+export declare class IoBrokerDeviceInfo extends DeviceInfo {
+    devID: string;
+    deviceType: string;
+    deviceRoomIndex: number;
+    type: 'device' | 'channel' | 'state';
+    fullID: string;
+    channel?: number;
+    valueName?: string;
+    devConf: deviceConfig;
+    /**
+     * Extracts the relevant infos from the passed deviceConfig and combines them in a new Info object
+     * @param {deviceConfig} pDevConf The device Config based on the extracted devices.json from ioBroker
+     * @param {boolean} isJsStateChildObject Within JS Objects, creating devices is limited,
+     * so we name the first child state for the object creation (e.g. javascript.0.00-EnergyManager.CurrentProduction)
+     */
+    constructor(pDevConf: deviceConfig, isJsStateChildObject?: boolean);
+    toJSON(): Partial<IoBrokerDeviceInfo>;
+}

package/lib/server/devices/IoBrokerDeviceInfo.js

@@ -0,0 +1,70 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IoBrokerDeviceInfo = void 0;
+const lodash_1 = __importDefault(require("lodash"));
+const DeviceInfo_1 = require("./DeviceInfo");
+class IoBrokerDeviceInfo extends DeviceInfo_1.DeviceInfo {
+    /**
+     * Extracts the relevant infos from the passed deviceConfig and combines them in a new Info object
+     * @param {deviceConfig} pDevConf The device Config based on the extracted devices.json from ioBroker
+     * @param {boolean} isJsStateChildObject Within JS Objects, creating devices is limited,
+     * so we name the first child state for the object creation (e.g. javascript.0.00-EnergyManager.CurrentProduction)
+     */
+    constructor(pDevConf, isJsStateChildObject = false) {
+        super();
+        this.devConf = pDevConf;
+        this.type = pDevConf.type;
+        const idSplit = pDevConf._id.split('.');
+        this.fullID = pDevConf._id;
+        this.devID = idSplit[2];
+        this.fullName = pDevConf.common.name;
+        const nameSplit = pDevConf.common.name.split('-');
+        if (!isJsStateChildObject) {
+            /**
+             * 0: hm-rpc
+             * 1: rcpInstance
+             * 2: Device ID
+             * 3?: Channel
+             * 4?: ValueName
+             */
+            if (idSplit.length > 3) {
+                this.channel = Number(idSplit[3]);
+            }
+            if (idSplit.length > 4) {
+                this.valueName = idSplit[4];
+            }
+            /** Name-Split
+             * 0: Indikator own "00"
+             * 1: "HmIP"
+             * 2: Raum
+             * 3: Was für ein Gerät
+             * 4: Index dieses Gerätes im Raum (ggf. + :Channel)
+             * 5?: Name des Wertes
+             */
+            this.room = nameSplit[2];
+            this.deviceType = nameSplit[3];
+            this.deviceRoomIndex = Number(nameSplit[4].split(':')[0]);
+            return;
+        }
+        else {
+            /** Name-Split
+             * 0: Indikator own "00"
+             * 1: "EnergyManager"
+             * 2: Raum
+             * 3: Was für ein Gerät
+             * 4: Index dieses Gerätes im Raum (ggf. + :Channel)
+             * 5?: Name des Wertes
+             */
+            this.deviceType = nameSplit[1];
+            this.room = nameSplit.length >= 3 ? nameSplit[2] : '';
+            this.deviceRoomIndex = nameSplit.length >= 4 ? Number(nameSplit[3]) : 0;
+        }
+    }
+    toJSON() {
+        return lodash_1.default.omit(this, ['devConf']);
+    }
+}
+exports.IoBrokerDeviceInfo = IoBrokerDeviceInfo;

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

@@ -6,7 +6,6 @@ export interface IBaseDevice {
     deviceType: DeviceType;
     info: DeviceInfo;
     readonly id: string;
-    battery: number | undefined;
     log(level: LogLevel, message: string): void;
     toJSON(): Partial<IBaseDevice>;
 }

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

@@ -3,8 +3,7 @@ import { IBaseDevice } from './baseDeviceInterfaces';
 export declare class DeviceList {
     private _ids;
     private readonly _isSonos;
-    private readonly _isAc;
-    constructor(_ids?: string[], _isSonos?: boolean, _isAc?: boolean);
+    constructor(_ids?: string[], _isSonos?: boolean);
     get ids(): string[];
     getDevices(): Array<IBaseDevice | OwnSonosDevice | AcDevice>;
 }

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

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceList = void 0;
 const services_1 = require("../services");
 class DeviceList {
-    constructor(_ids = [], _isSonos = false, _isAc = false) {
+    constructor(_ids = [], _isSonos = false) {
         this._ids = _ids;
         this._isSonos = _isSonos;
-        this._isAc = _isAc;
         // Empty
     }
     get ids() {
@@ -21,12 +20,6 @@ class DeviceList {
                     result.push(services_1.OwnSonosDevices.ownDevices[dID]);
                 }
             }
-            else if (this._isAc) {
-                const acDevice = services_1.OwnAcDevices.ownDevices[dID];
-                if (acDevice !== undefined) {
-                    result.push(services_1.OwnAcDevices.ownDevices[dID]);
-                }
-            }
             else {
                 const d = services_1.API.getDevice(dID);
                 if (d !== undefined) {

package/lib/server/devices/devices.js

@@ -6,7 +6,7 @@ const hmIPDevices_1 = require("./hmIPDevices");
 const zigbee_1 = require("./zigbee");
 const deviceType_1 = require("./deviceType");
 const services_1 = require("../services");
-const DeviceInfo_1 = require("./DeviceInfo");
+const IoBrokerDeviceInfo_1 = require("./IoBrokerDeviceInfo");
 const jsObject_1 = require("./jsObject");
 const wledDevice_1 = require("./wledDevice");
 class Devices {
@@ -78,7 +78,7 @@ class Devices {
         return result.join('\n');
     }
     static processZigbeeDevice(cDevConf) {
-        const zigbeeInfo = new DeviceInfo_1.DeviceInfo(cDevConf);
+        const zigbeeInfo = new IoBrokerDeviceInfo_1.IoBrokerDeviceInfo(cDevConf);
         const fullName = `${Devices.IDENTIFIER_ZIGBEE}-${zigbeeInfo.devID}`;
         zigbeeInfo.allDevicesKey = fullName;
         if (typeof Devices.alLDevices[fullName] !== 'undefined') {
@@ -151,17 +151,17 @@ class Devices {
         Devices.alLDevices[fullName] = d;
     }
     static processWledDevice(cDevConf) {
-        const wledDeviceInfo = new DeviceInfo_1.DeviceInfo(cDevConf);
-        const fullName = `${Devices.IDENTIFIER_WLED}-${wledDeviceInfo.devID}`;
-        wledDeviceInfo.allDevicesKey = fullName;
+        const wledIoBrokerDeviceInfo = new IoBrokerDeviceInfo_1.IoBrokerDeviceInfo(cDevConf);
+        const fullName = `${Devices.IDENTIFIER_WLED}-${wledIoBrokerDeviceInfo.devID}`;
+        wledIoBrokerDeviceInfo.allDevicesKey = fullName;
         if (typeof Devices.alLDevices[fullName] !== 'undefined') {
             return;
         }
-        services_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `${wledDeviceInfo.devID} with Type "${wledDeviceInfo.deviceType}" doesn't exists --> create it`);
-        Devices.alLDevices[fullName] = new wledDevice_1.WledDevice(wledDeviceInfo);
+        services_1.ServerLogService.writeLog(models_1.LogLevel.Trace, `${wledIoBrokerDeviceInfo.devID} with Type "${wledIoBrokerDeviceInfo.deviceType}" doesn't exists --> create it`);
+        Devices.alLDevices[fullName] = new wledDevice_1.WledDevice(wledIoBrokerDeviceInfo);
     }
     static processHMIPDevice(cDevConf) {
-        const hmIPInfo = new DeviceInfo_1.DeviceInfo(cDevConf);
+        const hmIPInfo = new IoBrokerDeviceInfo_1.IoBrokerDeviceInfo(cDevConf);
         const fullName = `${Devices.IDENTIFIER_HOMEMATIC}-${hmIPInfo.devID}`;
         hmIPInfo.allDevicesKey = fullName;
         if (typeof Devices.alLDevices[fullName] !== 'undefined') {
@@ -214,7 +214,7 @@ class Devices {
         Devices.alLDevices[fullName] = d;
     }
     static createEnergyManager(cDevConf) {
-        const devInfo = new DeviceInfo_1.DeviceInfo(cDevConf, true);
+        const devInfo = new IoBrokerDeviceInfo_1.IoBrokerDeviceInfo(cDevConf, true);
         const fullName = `${Devices.IDENTIFIER_JS}-${devInfo.devID}`;
         devInfo.allDevicesKey = fullName;
         Devices.energymanager = new jsObject_1.JsObjectEnergyManager(devInfo);

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

@@ -14,7 +14,7 @@ class HeatGroup extends base_group_1.BaseGroup {
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Heater, new device_list_1.DeviceList(heaterIds));
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.TemperaturSensor, new device_list_1.DeviceList(tempSensorIds));
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.HumiditySensor, new device_list_1.DeviceList(humiditySensorIds));
-        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Ac, new device_list_1.DeviceList(acIds, false, true));
+        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Ac, new device_list_1.DeviceList(acIds, false));
     }
     /**
      * The current measured temperature of the room in Celsius

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

@@ -10,7 +10,7 @@ class SonosGroup extends base_group_1.BaseGroup {
     constructor(roomName, speakerIds) {
         super(roomName, group_type_1.GroupType.Speaker);
         this._playing = false;
-        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Speaker, new device_list_1.DeviceList(speakerIds, true, false));
+        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Speaker, new device_list_1.DeviceList(speakerIds, true));
     }
     getOwnSonosDevices() {
         return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Speaker);

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

@@ -1,8 +1,8 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
-import { DeviceInfo } from '../DeviceInfo';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpAccessPoint extends HmIPDevice {
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     private _ip;
     get ip(): string;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;

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

@@ -1,8 +1,8 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
 import { MotionSensorSettings } from '../../../models';
-import { DeviceInfo } from '../DeviceInfo';
 import { iIlluminationSensor, iMotionSensor } from '../baseDeviceInterfaces';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpBewegung extends HmIPDevice implements iIlluminationSensor, iMotionSensor {
     private static MOVEMENT_DETECTION;
     private static CURRENT_ILLUMINATION;
@@ -12,7 +12,7 @@ export declare class HmIpBewegung extends HmIPDevice implements iIlluminationSen
     private initialized;
     private _fallBackTimeout;
     private _lastMotionTime;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     get timeSinceLastMotion(): number;
     private _detectionsToday;
     get detectionsToday(): number;

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

@@ -1,9 +1,9 @@
 /// <reference types="iobroker" />
 import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
 import { DeviceType } from '../deviceType';
-import { DeviceInfo } from '../DeviceInfo';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIPDevice extends IoBrokerBaseDevice {
     lowBattery: boolean;
-    constructor(pInfo: DeviceInfo, pType: DeviceType);
+    constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
 }

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

@@ -1,9 +1,9 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
-import { DeviceInfo } from '../DeviceInfo';
 import { FensterPosition } from '../models';
 import { Fenster } from '../groups';
 import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpGriff extends HmIPDevice {
     position: FensterPosition;
     private _kippCallback;
@@ -13,7 +13,7 @@ export declare class HmIpGriff extends HmIPDevice {
     private minutesOpen;
     private _fenster;
     private _helpingRoomTemp;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     set Fenster(value: Fenster);
     addOffenCallback(pCallback: (pValue: boolean) => void): void;
     addKippCallback(pCallback: (pValue: boolean) => void): void;

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

@@ -1,8 +1,8 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
-import { DeviceInfo } from '../DeviceInfo';
 import { HeaterSettings, TemperatureSettings } from '../../../models';
 import { iHeater, iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSensor, iHumiditySensor, iHeater {
     settings: HeaterSettings;
     private _iAutomaticInterval;
@@ -12,7 +12,7 @@ export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSe
     private _automaticPoints;
     private _humidityCallbacks;
     private _temperatureCallbacks;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     protected _seasonTurnOff: boolean;
     get seasonTurnOff(): boolean;
     set seasonTurnOff(value: boolean);

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

@@ -1,11 +1,11 @@
 /// <reference types="iobroker" />
-import { DeviceInfo } from '../DeviceInfo';
 import { HmIPDevice } from './hmIpDevice';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpHeizung extends HmIPDevice {
     private _temperatur;
     private _level;
     private _adaptionState;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     private _desiredTemperatur;
     get desiredTemperatur(): number;
     get iLevel(): number;

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

@@ -1,8 +1,8 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
 import { ActuatorSettings, TimeOfDay } from '../../../models';
-import { DeviceInfo } from '../DeviceInfo';
 import { iLamp } from '../baseDeviceInterfaces';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpLampe extends HmIPDevice implements iLamp {
     lightOn: boolean;
     queuedLightValue: boolean | null;
@@ -10,7 +10,7 @@ export declare class HmIpLampe extends HmIPDevice implements iLamp {
     private lightOnSwitchID;
     private _turnOffTimeout;
     private turnOffTime;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     /** @inheritdoc */
     setLight(pValue: boolean, timeout?: number, force?: boolean): void;

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

@@ -1,7 +1,7 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
-import { DeviceInfo } from '../DeviceInfo';
 import { iIlluminationSensor } from '../baseDeviceInterfaces';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpPraezenz extends HmIPDevice implements iIlluminationSensor {
     private static PRESENCE_DETECTION;
     private static CURRENT_ILLUMINATION;
@@ -9,7 +9,7 @@ export declare class HmIpPraezenz extends HmIPDevice implements iIlluminationSen
     presenceDetected: boolean;
     private _presenceDetectedCallback;
     private initialized;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     private _detectionsToday;
     get detectionsToday(): number;
     set detectionsToday(pVal: number);

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

@@ -1,15 +1,15 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
-import { DeviceInfo } from '../DeviceInfo';
 import { Fenster } from '../groups';
 import { iShutter } from '../baseDeviceInterfaces';
 import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpRoll extends HmIPDevice implements iShutter {
     private _setLevelSwitchID;
     private _firstCommandRecieved;
     private _setLevel;
     private _setLevelTime;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     private _currentLevel;
     get currentLevel(): number;
     set currentLevel(value: number);

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

@@ -1,8 +1,8 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
 import { iButtonSwitch } from '../baseDeviceInterfaces';
-import { DeviceInfo } from '../DeviceInfo';
 import { Button } from '../button';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpTaster extends HmIPDevice implements iButtonSwitch {
     private static readonly BUTTON_CAPABILLITIES;
     buttonTopLeft: Button;
@@ -13,7 +13,7 @@ export declare class HmIpTaster extends HmIPDevice implements iButtonSwitch {
     buttonBotRight: Button;
     buttonBot: undefined;
     buttonTop: undefined;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     getButtonAssignment(): string;
 }

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

@@ -1,7 +1,7 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
-import { DeviceInfo } from '../DeviceInfo';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpTherm extends HmIPDevice {
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
 }

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

@@ -1,14 +1,14 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
 import { MagnetPosition } from '../models';
-import { DeviceInfo } from '../DeviceInfo';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpTuer extends HmIPDevice {
     position: MagnetPosition;
     private _closedCallback;
     private _openCallback;
     private _iOpenTimeout;
     private minutesOpen;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     addOpenCallback(pCallback: (pValue: boolean) => void): void;
     addClosedCallback(pCallback: (pValue: boolean) => void): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;

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

@@ -1,8 +1,8 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
-import { DeviceInfo } from '../DeviceInfo';
 import { Button } from '../button';
 import { iButtonSwitch } from '../baseDeviceInterfaces';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpWippe extends HmIPDevice implements iButtonSwitch {
     private static readonly BUTTON_CAPABILLITIES;
     buttonTopLeft: undefined;
@@ -13,7 +13,7 @@ export declare class HmIpWippe extends HmIPDevice implements iButtonSwitch {
     buttonBotRight: undefined;
     buttonBot: Button;
     buttonTop: Button;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     getButtonAssignment(): string;
 }

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

@@ -1,7 +1,7 @@
 /// <reference types="iobroker" />
 import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
 import { iEnergyManager, iExcessEnergyConsumer, PhaseState } from '../baseDeviceInterfaces';
-import { DeviceInfo } from '../DeviceInfo';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class JsObjectEnergyManager extends IoBrokerBaseDevice implements iEnergyManager {
     private _excessEnergyConsumer;
     private _iCalculationInterval;
@@ -13,7 +13,7 @@ export declare class JsObjectEnergyManager extends IoBrokerBaseDevice implements
     private _powerValuePhaseC;
     private blockDeviceChangeTime;
     private _lastDeviceChange;
-    constructor(info: DeviceInfo);
+    constructor(info: IoBrokerDeviceInfo);
     private _currentProduction;
     get currentProduction(): number;
     get baseConsumption(): number;

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

@@ -1,8 +1,8 @@
 /// <reference types="iobroker" />
 import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
-import { DeviceInfo } from './DeviceInfo';
 import { TimeOfDay } from '../../models';
 import { WledSettings } from '../../models/deviceSettings/wledSettings';
+import { IoBrokerDeviceInfo } from './IoBrokerDeviceInfo';
 export declare class WledDevice extends IoBrokerBaseDevice {
     on: boolean;
     brightness: number;
@@ -13,7 +13,7 @@ export declare class WledDevice extends IoBrokerBaseDevice {
     private readonly _onID;
     private readonly _presetID;
     private readonly _brightnessID;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, _pOverride?: boolean): void;
     setLight(pValue: boolean, brightness?: number, preset?: number): void;
     setTimeBased(time: TimeOfDay): void;