hoffmation-base 1.0.36 → 1.0.37

package/lib/server/devices/zigbee/BaseDevices/zigbeeDevice.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="iobroker" />
 import { DeviceType } from '../../deviceType';
 import { IoBrokerBaseDevice } from '../../IoBrokerBaseDevice';
-import { DeviceInfo } from '../../DeviceInfo';
+import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 export declare class ZigbeeDevice extends IoBrokerBaseDevice {
     available: boolean;
     linkQuality: number;
     voltage: string;
-    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/zigbee/BaseDevices/zigbeeHeater.d.ts

@@ -2,8 +2,8 @@
 import { ZigbeeDevice } from './zigbeeDevice';
 import { iHeater } from '../../baseDeviceInterfaces';
 import { HeaterSettings, TemperatureSettings } from '../../../../models';
-import { DeviceInfo } from '../../DeviceInfo';
 import { DeviceType } from '../../deviceType';
+import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater {
     settings: HeaterSettings;
     protected _automaticPoints: {
@@ -15,7 +15,7 @@ export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater {
     protected _setPointTemperaturID: string;
     protected _temperatur: number;
     protected _desiredTemperatur: number;
-    constructor(pInfo: DeviceInfo, pType: DeviceType);
+    constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
     protected _seasonTurnOff: boolean;
     get seasonTurnOff(): boolean;
     set seasonTurnOff(value: boolean);

package/lib/server/devices/zigbee/BaseDevices/zigbeeMagnetContact.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="iobroker" />
 import { DeviceType } from '../../deviceType';
-import { DeviceInfo } from '../../DeviceInfo';
 import { ZigbeeDevice } from './zigbeeDevice';
 import { MagnetPosition } from '../../models';
+import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 export declare class ZigbeeMagnetContact extends ZigbeeDevice {
     position: MagnetPosition;
     telegramOnOpen: boolean;
@@ -11,7 +11,7 @@ export declare class ZigbeeMagnetContact extends ZigbeeDevice {
     private _openCallback;
     private _iOpenTimeout;
     private minutesOpen;
-    constructor(pInfo: DeviceInfo, deviceType: DeviceType);
+    constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
     addOpenCallback(pCallback: (pValue: boolean) => void): void;
     addClosedCallback(pCallback: (pValue: boolean) => void): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverrride?: boolean): void;

package/lib/server/devices/zigbee/BaseDevices/zigbeeShutter.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="node" />
 /// <reference types="iobroker" />
 import { DeviceType } from '../../deviceType';
-import { DeviceInfo } from '../../DeviceInfo';
 import { ShutterCalibration, ShutterSettings } from '../../../../models';
 import { ZigbeeDevice } from './zigbeeDevice';
 import { iShutter } from '../../baseDeviceInterfaces';
 import { Fenster } from '../../groups';
 import { IoBrokerBaseDevice } from '../../IoBrokerBaseDevice';
+import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 export declare class ZigbeeShutter extends ZigbeeDevice implements iShutter {
     settings: ShutterSettings;
     protected _iMovementFinishTimeout: NodeJS.Timeout | null;
@@ -14,7 +14,7 @@ export declare class ZigbeeShutter extends ZigbeeDevice implements iShutter {
     protected _setLevel: number;
     protected _setLevelTime: number;
     protected _shutterCalibrationData: ShutterCalibration;
-    constructor(pInfo: DeviceInfo, pType: DeviceType);
+    constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
     protected _currentLevel: number;
     get currentLevel(): number;
     set currentLevel(value: number);

package/lib/server/devices/zigbee/BaseDevices/zigbeeSwitch.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="iobroker" />
 import { iButtonSwitch } from '../../baseDeviceInterfaces';
 import { ZigbeeDevice } from './zigbeeDevice';
-import { DeviceInfo } from '../../DeviceInfo';
 import { DeviceType } from '../../deviceType';
 import { Button } from '../../button';
+import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 export declare abstract class ZigbeeSwitch extends ZigbeeDevice implements iButtonSwitch {
     abstract buttonBot: Button | undefined;
     abstract buttonBotLeft: Button | undefined;
@@ -13,7 +13,7 @@ export declare abstract class ZigbeeSwitch extends ZigbeeDevice implements iButt
     abstract buttonTop: Button | undefined;
     abstract buttonTopLeft: Button | undefined;
     abstract buttonTopRight: Button | undefined;
-    constructor(pInfo: DeviceInfo, deviceType: DeviceType);
+    constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverrride?: boolean): void;
     abstract getButtonAssignment(): string;
 }

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

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

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

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

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

@@ -1,11 +1,11 @@
 /// <reference types="iobroker" />
-import { DeviceInfo } from '../DeviceInfo';
 import { iIlluminationSensor } from '../baseDeviceInterfaces';
 import { ZigbeeMotionSensor } from './zigbeeMotionSensor';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeAquaraMotion extends ZigbeeMotionSensor implements iIlluminationSensor {
     private _illuminance;
     private occupancyTimeoutID;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     private _motionTimeout;
     get motionTimeout(): number;
     set motionTimeout(value: number);

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

@@ -1,7 +1,7 @@
 /// <reference types="iobroker" />
-import { DeviceInfo } from '../DeviceInfo';
 import { iVibrationSensor } from '../baseDeviceInterfaces';
 import { ZigbeeDevice } from './BaseDevices';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeAquaraVibra extends ZigbeeDevice implements iVibrationSensor {
     sensitivity: string;
     tiltAngle: number;
@@ -16,7 +16,7 @@ export declare class ZigbeeAquaraVibra extends ZigbeeDevice implements iVibratio
     vibrationBlockedByMotionTimeStamp: number;
     private _idSensitivity;
     private _alarmMessage;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     private _vibrationBlockedByGriff;
     get vibrationBlockedByGriff(): boolean;
     set vibrationBlockedByGriff(pVal: boolean);

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="iobroker" />
-import { DeviceInfo } from '../DeviceInfo';
 import { ZigbeeDevice } from './BaseDevices';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeAquaraWater extends ZigbeeDevice {
     water: boolean;
     iAlarmTimeout: NodeJS.Timeout | undefined;
@@ -9,7 +9,7 @@ export declare class ZigbeeAquaraWater extends ZigbeeDevice {
     private _messageAlarm;
     private _messageAlarmEnd;
     private _supressAlarmTimeStamp;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     private _roomName;
     set roomName(val: string);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;

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

@@ -1,8 +1,8 @@
 /// <reference types="iobroker" />
 import { ActuatorSettings, ExcessEnergyConsumerSettings } from '../../../models';
-import { DeviceInfo } from '../DeviceInfo';
 import { ZigbeeDevice } from './BaseDevices';
 import { iExcessEnergyConsumer } from '../baseDeviceInterfaces';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeBlitzShp extends ZigbeeDevice implements iExcessEnergyConsumer {
     steckerOn: boolean;
     current: number;
@@ -13,7 +13,7 @@ export declare class ZigbeeBlitzShp extends ZigbeeDevice implements iExcessEnerg
     private readonly _availableForExcessEnergy;
     private readonly steckerOnSwitchID;
     private _activatedByExcessEnergy;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     get currentConsumption(): number;
     get on(): boolean;
     isAvailableForExcessEnergy(): boolean;

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

@@ -1,6 +1,6 @@
 /// <reference types="iobroker" />
 import { ZigbeeHeater } from './BaseDevices';
-import { DeviceInfo } from '../DeviceInfo';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeEuroHeater extends ZigbeeHeater {
     private _setLocalTempCalibrationId;
     private _targetTempVal;
@@ -9,7 +9,7 @@ export declare class ZigbeeEuroHeater extends ZigbeeHeater {
     private _setModeId;
     private _valvePosId;
     private _mode;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     set seasonTurnOff(value: boolean);
     set roomTemperatur(value: number);
     set desiredTemperature(val: number);

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

@@ -1,14 +1,14 @@
 /// <reference types="node" />
 /// <reference types="iobroker" />
-import { DeviceInfo } from '../DeviceInfo';
 import { ZigbeeDevice } from './BaseDevices';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeHeimanSmoke extends ZigbeeDevice {
     smoke: boolean;
     iAlarmTimeout: NodeJS.Timeout | undefined;
     private _messageAlarmFirst;
     private _messageAlarm;
     private _messageAlarmEnd;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     private _roomName;
     set roomName(val: string);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;

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

@@ -1,8 +1,8 @@
 /// <reference types="iobroker" />
 import { ZigbeeActuator } from './BaseDevices';
-import { DeviceInfo } from '../DeviceInfo';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeIkeaSteckdose extends ZigbeeActuator {
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     get steckerOn(): boolean;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     setStecker(pValue: boolean, timeout?: number, force?: boolean): void;

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

@@ -1,9 +1,9 @@
 /// <reference types="iobroker" />
 import { ZigbeeActuator } from './BaseDevices';
-import { DeviceInfo } from '../DeviceInfo';
 import { DeviceType } from '../deviceType';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeIlluActuator extends ZigbeeActuator {
-    constructor(pInfo: DeviceInfo, deviceType?: DeviceType);
+    constructor(pInfo: IoBrokerDeviceInfo, deviceType?: DeviceType);
     get isActuatorOn(): boolean;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, handledByChildObject?: boolean): void;
     setActuator(pValue: boolean, timeout?: number, force?: boolean): void;

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

@@ -1,8 +1,8 @@
 /// <reference types="iobroker" />
 import { DimmerSettings, TimeOfDay } from '../../../models';
-import { DeviceInfo } from '../DeviceInfo';
 import { iLamp } from '../baseDeviceInterfaces';
 import { ZigbeeDevice } from './BaseDevices';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeIlluDimmer extends ZigbeeDevice implements iLamp {
     lightOn: boolean;
     queuedValue: boolean | null;
@@ -14,7 +14,7 @@ export declare class ZigbeeIlluDimmer extends ZigbeeDevice implements iLamp {
     private transitionID;
     private _turnOffTimeout;
     private turnOffTime;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     setTimeBased(time: TimeOfDay, timeout?: number, force?: boolean): void;
     /**

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

@@ -1,10 +1,10 @@
 /// <reference types="iobroker" />
-import { DeviceInfo } from '../DeviceInfo';
 import { ZigbeeIlluActuator } from './zigbeeIlluActuator';
 import { TimeOfDay } from '../../../models';
 import { iLamp } from '../baseDeviceInterfaces';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeIlluLampe extends ZigbeeIlluActuator implements iLamp {
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     get lightOn(): boolean;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     /** @inheritdoc */

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

@@ -1,7 +1,7 @@
 /// <reference types="iobroker" />
-import { DeviceInfo } from '../DeviceInfo';
 import { LedSettings, TimeOfDay } from '../../../models';
 import { ZigbeeDevice } from './BaseDevices';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeIlluLedRGBCCT extends ZigbeeDevice {
     static DEFAULT_COLOR_WARM: string;
     on: boolean;
@@ -13,7 +13,7 @@ export declare class ZigbeeIlluLedRGBCCT extends ZigbeeDevice {
     private brightnessID;
     private colorID;
     private colorTempID;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     setTimeBased(time: TimeOfDay): void;
     setLight(pValue: boolean, brightness?: number, color?: string, colortemp?: number): void;

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

@@ -1,13 +1,13 @@
 /// <reference types="iobroker" />
 import { ZigbeeShutter } from './BaseDevices';
-import { DeviceInfo } from '../DeviceInfo';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeIlluShutter extends ZigbeeShutter {
     private _movementStateId;
     private _movementState;
     private _movementStartMs;
     private _movementStartPos;
     private _iMovementTimeout;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     protected moveToPosition(targetPosition: number): void;
     private changeMovementState;

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

@@ -3,8 +3,8 @@
 import { DeviceType } from '../deviceType';
 import { ZigbeeDevice } from './BaseDevices';
 import { MotionSensorSettings } from '../../../models';
-import { DeviceInfo } from '../DeviceInfo';
 import { iMotionSensor } from '../baseDeviceInterfaces';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionSensor {
     settings: MotionSensorSettings;
     movementDetected: boolean;
@@ -12,7 +12,7 @@ export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionS
     protected _movementDetectedCallback: Array<(pValue: boolean) => void>;
     protected _needsMovementResetFallback: boolean;
     protected _fallBackTimeout: NodeJS.Timeout | undefined;
-    constructor(pInfo: DeviceInfo, type: DeviceType);
+    constructor(pInfo: IoBrokerDeviceInfo, type: DeviceType);
     protected _timeSinceLastMotion: number;
     get timeSinceLastMotion(): number;
     protected _detectionsToday: number;

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

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

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

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

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

@@ -1,11 +1,11 @@
 /// <reference types="iobroker" />
 import { ZigbeeDevice } from './BaseDevices';
 import { iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
-import { DeviceInfo } from '../DeviceInfo';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeSonoffTemp extends ZigbeeDevice implements iTemperatureSensor, iHumiditySensor {
     private _humidityCallbacks;
     private _temperaturCallbacks;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     private _humidity;
     get humidity(): number;
     private set humidity(value);

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

@@ -1,6 +1,6 @@
 /// <reference types="iobroker" />
 import { ZigbeeHeater } from './BaseDevices';
-import { DeviceInfo } from '../DeviceInfo';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeTuyaValve extends ZigbeeHeater {
     private _setLocalTempCalibrationId;
     private _targetTempVal;
@@ -8,7 +8,7 @@ export declare class ZigbeeTuyaValve extends ZigbeeHeater {
     private _localDiffTempVal;
     private _setModeId;
     private _mode;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     set seasonTurnOff(value: boolean);
     set roomTemperatur(value: number);
     set desiredTemperature(val: number);

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

@@ -1,9 +1,9 @@
 /// <reference types="iobroker" />
 import { ZigbeeShutter } from './BaseDevices';
-import { DeviceInfo } from '../DeviceInfo';
+import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeUbisysShutter extends ZigbeeShutter {
     private _positionStateId;
-    constructor(pInfo: DeviceInfo);
+    constructor(pInfo: IoBrokerDeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     protected moveToPosition(pPosition: number): void;
 }

package/lib/server/services/ac/ac-device.d.ts

@@ -1,21 +1,23 @@
-import { iExcessEnergyConsumer } from '../../devices';
+import { DeviceInfo, DeviceType, IBaseDevice, iExcessEnergyConsumer } from '../../devices';
 import { ExcessEnergyConsumerSettings, LogLevel, RoomBase } from '../../../models';
 import { LogDebugType } from '../log-service';
 import { AcMode } from './ac-mode';
 import { AcSettings } from '../../../models/deviceSettings/acSettings';
 import { AcDeviceType } from './acDeviceType';
-export declare abstract class AcDevice implements iExcessEnergyConsumer {
-    name: string;
-    roomName: string;
+export declare abstract class AcDevice implements iExcessEnergyConsumer, IBaseDevice {
     ip: string;
     acDeviceType: AcDeviceType;
     currentConsumption: number;
     energyConsumerSettings: ExcessEnergyConsumerSettings;
     acSettings: AcSettings;
     room: RoomBase | undefined;
+    info: DeviceInfo;
+    protected constructor(name: string, roomName: string, ip: string, acDeviceType: AcDeviceType);
+    abstract get deviceType(): DeviceType;
+    get name(): string;
     protected _activatedByExcessEnergy: boolean;
     protected _blockAutomaticTurnOnMS: number;
-    protected constructor(name: string, roomName: string, ip: string, acDeviceType: AcDeviceType);
+    get id(): string;
     abstract get on(): boolean;
     isAvailableForExcessEnergy(): boolean;
     calculateDesiredMode(): AcMode;
@@ -32,4 +34,5 @@ export declare abstract class AcDevice implements iExcessEnergyConsumer {
     log(level: LogLevel, message: string, debugType?: LogDebugType): void;
     wasActivatedByExcessEnergy(): boolean;
     private automaticCheck;
+    toJSON(): Partial<AcDevice>;
 }

package/lib/server/services/ac/ac-device.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AcDevice = void 0;
+const devices_1 = require("../../devices");
 const models_1 = require("../../../models");
 const utils_1 = require("../utils");
 const log_service_1 = require("../log-service");
@@ -8,8 +9,6 @@ const ac_mode_1 = require("./ac-mode");
 const acSettings_1 = require("../../../models/deviceSettings/acSettings");
 class AcDevice {
     constructor(name, roomName, ip, acDeviceType) {
-        this.name = name;
-        this.roomName = roomName;
         this.ip = ip;
         this.acDeviceType = acDeviceType;
         this.currentConsumption = -1;
@@ -17,8 +16,20 @@ class AcDevice {
         this.acSettings = new acSettings_1.AcSettings();
         this._activatedByExcessEnergy = false;
         this._blockAutomaticTurnOnMS = -1;
+        this.info = new devices_1.DeviceInfo();
+        this.info.fullName = `AC ${name}`;
+        this.info.customName = name;
+        this.info.room = roomName;
+        this.info.allDevicesKey = `ac-${roomName}-${name}`;
         utils_1.Utils.guardedInterval(this.automaticCheck, 60000, this, true);
     }
+    get name() {
+        return this.info.customName;
+    }
+    get id() {
+        var _a;
+        return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `ac-${this.info.room}-${this.info.customName}`;
+    }
     isAvailableForExcessEnergy() {
         if (utils_1.Utils.nowMS() < this._blockAutomaticTurnOnMS) {
             return false;
@@ -89,5 +100,8 @@ class AcDevice {
             return;
         }
     }
+    toJSON() {
+        return utils_1.Utils.jsonFilter(this);
+    }
 }
 exports.AcDevice = AcDevice;

package/lib/server/services/ac/own-ac-devices.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OwnAcDevices = void 0;
 const log_service_1 = require("../log-service");
 const models_1 = require("../../../models");
+const devices_1 = require("../../devices");
 class OwnAcDevices {
     static addDevice(device) {
-        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Device ${device.name} for room "${device.roomName}" addded`);
+        log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Device ${device.name} for room "${device.info.room}" addded`);
         this.ownDevices[device.name] = device;
+        devices_1.Devices.alLDevices[device.id] = device;
     }
 }
 exports.OwnAcDevices = OwnAcDevices;

package/lib/server/services/ac/own-daikin-device.d.ts

@@ -1,11 +1,13 @@
 import { DaikinAC } from 'daikin-controller';
 import { AcDevice } from './ac-device';
 import { AcMode } from './ac-mode';
+import { DeviceType } from '../../devices';
 export declare class OwnDaikinDevice extends AcDevice {
     desiredState: boolean;
     desiredTemp: number;
     desiredHum: number | 'AUTO';
     desiredMode: number;
+    deviceType: DeviceType;
     constructor(name: string, roomName: string, ip: string, device: DaikinAC | undefined);
     private _device;
     get device(): DaikinAC | undefined;

package/lib/server/services/ac/own-daikin-device.js

@@ -10,6 +10,7 @@ const utils_1 = require("../utils");
 const ac_device_1 = require("./ac-device");
 const ac_mode_1 = require("./ac-mode");
 const acDeviceType_1 = require("./acDeviceType");
+const devices_1 = require("../../devices");
 class OwnDaikinDevice extends ac_device_1.AcDevice {
     constructor(name, roomName, ip, device) {
         super(name, roomName, ip, acDeviceType_1.AcDeviceType.Daikin);
@@ -17,6 +18,7 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
         this.desiredTemp = 21;
         this.desiredHum = 'AUTO';
         this.desiredMode = daikin_controller_1.Mode.COLD;
+        this.deviceType = devices_1.DeviceType.Daikin;
         this.energyConsumerSettings.priority = 50;
         this._device = device;
     }