hoffmation-base 1.0.43 → 1.0.46

package/lib/server/devices/zigbee/BaseDevices/zigbeeHeater.js

@@ -5,7 +5,7 @@ const zigbeeDevice_1 = require("./zigbeeDevice");
 const baseDeviceInterfaces_1 = require("../../baseDeviceInterfaces");
 const models_1 = require("../../../../models");
 const services_1 = require("../../../services");
-const DeviceCapabilities_1 = require("../../DeviceCapabilities");
+const DeviceCapability_1 = require("../../DeviceCapability");
 class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, pType) {
         super(pInfo, pType);
@@ -19,7 +19,7 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         this._seasonTurnOff = false;
         this._humidity = 0;
         this._roomTemperatur = 0;
-        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.heater);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.heater);
         this._iAutomaticInterval = services_1.Utils.guardedInterval(this.checkAutomaticChange, 300000, this); // Alle 5 Minuten prüfen
         services_1.TimeCallbackService.addCallback(new models_1.TimeCallback(`${this.info.fullID} Season Check`, models_1.TimeCallbackType.TimeOfDay, () => {
             this.checkSeasonTurnOff();

package/lib/server/devices/zigbee/BaseDevices/zigbeeMotionSensor.js

@@ -4,7 +4,7 @@ exports.ZigbeeMotionSensor = void 0;
 const index_1 = require("./index");
 const models_1 = require("../../../../models");
 const services_1 = require("../../../services");
-const DeviceCapabilities_1 = require("../../DeviceCapabilities");
+const DeviceCapability_1 = require("../../DeviceCapability");
 class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
     constructor(pInfo, type) {
         var _a;
@@ -16,7 +16,7 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
         this._needsMovementResetFallback = true;
         this._timeSinceLastMotion = 0;
         this._detectionsToday = 0;
-        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.motionSensor);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.motionSensor);
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.getCount(this).then((todayCount) => {
             this.detectionsToday = todayCount.counter;
             this.log(models_1.LogLevel.Debug, `Preinitialized movement counter with ${this.detectionsToday}`);

package/lib/server/devices/zigbee/BaseDevices/zigbeeShutter.js

@@ -9,7 +9,7 @@ const models_1 = require("../../../../models");
 const zigbeeDevice_1 = require("./zigbeeDevice");
 const models_2 = require("../../models");
 const lodash_1 = __importDefault(require("lodash"));
-const DeviceCapabilities_1 = require("../../DeviceCapabilities");
+const DeviceCapability_1 = require("../../DeviceCapability");
 class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, pType) {
         var _a;
@@ -21,7 +21,7 @@ class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
         this._setLevelTime = -1;
         this._shutterCalibrationData = new models_1.ShutterCalibration(this.info.fullID, 0, 0, 0, 0);
         this._currentLevel = -1;
-        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.shutter);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.shutter);
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.getShutterCalibration(this).then((calibrationData) => {
             this._shutterCalibrationData = calibrationData;
             this.log(models_1.LogLevel.DeepTrace, `ZigbeeShutter  initialized with calibration data`);

package/lib/server/devices/zigbee/zigbeeAquaraMotion.js

@@ -5,14 +5,14 @@ const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
 const BaseDevices_1 = require("./BaseDevices");
 const services_1 = require("../../services");
-const DeviceCapabilities_1 = require("../DeviceCapabilities");
+const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeAquaraMotion extends BaseDevices_1.ZigbeeMotionSensor {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraMotion);
         this._illuminance = 0;
         this.occupancyTimeoutID = `occupancy_timeout`;
         this._motionTimeout = 0;
-        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.illuminationSensor);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.illuminationSensor);
         this.occupancyTimeoutID = `${this.info.fullID}.${this.occupancyTimeoutID}`;
     }
     // Time after the last trigger until a motion event gets triggered again

package/lib/server/devices/zigbee/zigbeeAquaraVibra.js

@@ -5,7 +5,7 @@ const deviceType_1 = require("../deviceType");
 const services_1 = require("../../services");
 const models_1 = require("../../../models");
 const BaseDevices_1 = require("./BaseDevices");
-const DeviceCapabilities_1 = require("../DeviceCapabilities");
+const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraVibra);
@@ -24,7 +24,7 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
         // TODO Set Sensitivity
         this._vibrationBlockedByGriff = false;
         this._vibrationBlockedByMotion = false;
-        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.vibrationSensor);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.vibrationSensor);
         this._alarmMessage = services_1.Res.vibrationAlarm(this.info.customName);
         services_1.PollyService.preloadTTS(this._alarmMessage);
         this._idSensitivity = `${this.info.fullID}.sensitivity`;

package/lib/server/devices/zigbee/zigbeeBlitzShp.js

@@ -4,7 +4,7 @@ exports.ZigbeeBlitzShp = void 0;
 const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
 const BaseDevices_1 = require("./BaseDevices");
-const DeviceCapabilities_1 = require("../DeviceCapabilities");
+const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeBlitzShp extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeBlitzShp);
@@ -17,7 +17,7 @@ class ZigbeeBlitzShp extends BaseDevices_1.ZigbeeDevice {
         this._availableForExcessEnergy = true;
         this.steckerOnSwitchID = '';
         this._activatedByExcessEnergy = false;
-        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.excessEnergyConsumer);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.excessEnergyConsumer);
         this.steckerOnSwitchID = `${this.info.fullID}.state`;
     }
     get currentConsumption() {

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

@@ -3,8 +3,5 @@ import { ZigbeeActuator } from './BaseDevices';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeIkeaSteckdose extends ZigbeeActuator {
     constructor(pInfo: IoBrokerDeviceInfo);
-    get steckerOn(): boolean;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
-    setStecker(pValue: boolean, timeout?: number, force?: boolean): void;
-    toggleStecker(force?: boolean): boolean;
 }

package/lib/server/devices/zigbee/zigbeeIkeaSteckdose.js

@@ -8,18 +8,9 @@ class ZigbeeIkeaSteckdose extends BaseDevices_1.ZigbeeActuator {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeIkeaSteckdose, `${pInfo.fullID}.state`);
     }
-    get steckerOn() {
-        return super.actuatorOn;
-    }
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Stecker Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
     }
-    setStecker(pValue, timeout = -1, force = false) {
-        super.setActuator(pValue, timeout, force);
-    }
-    toggleStecker(force = false) {
-        return super.toggleActuator(force);
-    }
 }
 exports.ZigbeeIkeaSteckdose = ZigbeeIkeaSteckdose;

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

@@ -1,9 +1,9 @@
 /// <reference types="iobroker" />
 import { DimmerSettings, TimeOfDay } from '../../../models';
-import { iLamp } from '../baseDeviceInterfaces';
 import { ZigbeeDevice } from './BaseDevices';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-export declare class ZigbeeIlluDimmer extends ZigbeeDevice implements iLamp {
+import { iDimmableLamp } from '../baseDeviceInterfaces/iDimmableLamp';
+export declare class ZigbeeIlluDimmer extends ZigbeeDevice implements iDimmableLamp {
     lightOn: boolean;
     queuedValue: boolean | null;
     brightness: number;

package/lib/server/devices/zigbee/zigbeeIlluDimmer.js

@@ -5,7 +5,7 @@ const models_1 = require("../../../models");
 const deviceType_1 = require("../deviceType");
 const services_1 = require("../../services");
 const BaseDevices_1 = require("./BaseDevices");
-const DeviceCapabilities_1 = require("../DeviceCapabilities");
+const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeIlluDimmer extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeIlluDimmer);
@@ -19,7 +19,8 @@ class ZigbeeIlluDimmer extends BaseDevices_1.ZigbeeDevice {
         this.transitionID = 'transition_time';
         this._turnOffTimeout = undefined;
         this.turnOffTime = 0;
-        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.lamp);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.dimmablelamp);
         this.stateID = `${this.info.fullID}.state`;
         this.brightnessID = `${this.info.fullID}.brightness`;
         this.transitionID = `${this.info.fullID}.transition_time`;

package/lib/server/devices/zigbee/zigbeeIlluLampe.js

@@ -5,11 +5,11 @@ const deviceType_1 = require("../deviceType");
 const zigbeeIlluActuator_1 = require("./zigbeeIlluActuator");
 const models_1 = require("../../../models");
 const services_1 = require("../../services");
-const DeviceCapabilities_1 = require("../DeviceCapabilities");
+const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeIlluLampe extends zigbeeIlluActuator_1.ZigbeeIlluActuator {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeIlluLampe);
-        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.lamp);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
     }
     get lightOn() {
         return super.actuatorOn;

package/lib/server/devices/zigbee/zigbeeSonoffTemp.js

@@ -4,7 +4,7 @@ exports.ZigbeeSonoffTemp = void 0;
 const BaseDevices_1 = require("./BaseDevices");
 const baseDeviceInterfaces_1 = require("../baseDeviceInterfaces");
 const deviceType_1 = require("../deviceType");
-const DeviceCapabilities_1 = require("../DeviceCapabilities");
+const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeSonoffTemp);
@@ -12,8 +12,8 @@ class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
         this._temperaturCallbacks = [];
         this._humidity = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this._temperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
-        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.temperatureSensor);
-        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.humiditySensor);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.temperatureSensor);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.humiditySensor);
     }
     get humidity() {
         return this._humidity;

package/lib/server/services/Sonos/own-sonos-device.d.ts

@@ -2,14 +2,14 @@ import { DeviceInfo, DeviceType, ISpeaker } from '../../devices';
 import { LogLevel, RoomBase } from '../../../models';
 import { SonosDevice } from '@svrooij/sonos/lib';
 import { LogDebugType } from '../log-service';
-import { DeviceCapabilities } from '../../devices/DeviceCapabilities';
+import { DeviceCapability } from '../../devices/DeviceCapability';
 export declare class OwnSonosDevice implements ISpeaker {
     device: SonosDevice | undefined;
     maxPlayOnAllVolume: number;
     room: RoomBase | undefined;
     readonly deviceType: DeviceType;
     readonly discoveryName: string;
-    readonly deviceCapabilities: DeviceCapabilities[];
+    readonly deviceCapabilities: DeviceCapability[];
     constructor(discoveryName: string, roomName: string, device: SonosDevice | undefined);
     protected _info: DeviceInfo;
     get info(): DeviceInfo;

package/lib/server/services/Sonos/own-sonos-device.js

@@ -10,7 +10,7 @@ const log_service_1 = require("../log-service");
 const utils_1 = require("../utils");
 const lodash_1 = __importDefault(require("lodash"));
 const sonos_service_1 = require("./sonos-service");
-const DeviceCapabilities_1 = require("../../devices/DeviceCapabilities");
+const DeviceCapability_1 = require("../../devices/DeviceCapability");
 const settings_service_1 = require("../settings-service");
 const polly_service_1 = require("./polly-service");
 class OwnSonosDevice {
@@ -18,7 +18,7 @@ class OwnSonosDevice {
         this.device = device;
         this.maxPlayOnAllVolume = 80;
         this.deviceType = devices_1.DeviceType.Sonos;
-        this.deviceCapabilities = [DeviceCapabilities_1.DeviceCapabilities.speaker];
+        this.deviceCapabilities = [DeviceCapability_1.DeviceCapability.speaker];
         this.discoveryName = discoveryName;
         this._info = new devices_1.DeviceInfo();
         this._info.fullName = `Sonos ${roomName} ${discoveryName}`;

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

@@ -1,18 +1,18 @@
-import { DeviceInfo, DeviceType, iAcDevice, IBaseDevice, iExcessEnergyConsumer } from '../../devices';
+import { DeviceInfo, DeviceType, iAcDevice, 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';
-import { DeviceCapabilities } from '../../devices/DeviceCapabilities';
-export declare abstract class AcDevice implements iExcessEnergyConsumer, IBaseDevice, iAcDevice {
+import { DeviceCapability } from '../../devices/DeviceCapability';
+export declare abstract class AcDevice implements iExcessEnergyConsumer, iBaseDevice, iAcDevice {
     ip: string;
     acDeviceType: AcDeviceType;
     currentConsumption: number;
     energyConsumerSettings: ExcessEnergyConsumerSettings;
     acSettings: AcSettings;
     room: RoomBase | undefined;
-    deviceCapabilities: DeviceCapabilities[];
+    deviceCapabilities: DeviceCapability[];
     protected _info: DeviceInfo;
     protected constructor(name: string, roomName: string, ip: string, acDeviceType: AcDeviceType);
     get info(): DeviceInfo;

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

@@ -11,7 +11,7 @@ const log_service_1 = require("../log-service");
 const ac_mode_1 = require("./ac-mode");
 const acSettings_1 = require("../../../models/deviceSettings/acSettings");
 const lodash_1 = __importDefault(require("lodash"));
-const DeviceCapabilities_1 = require("../../devices/DeviceCapabilities");
+const DeviceCapability_1 = require("../../devices/DeviceCapability");
 class AcDevice {
     constructor(name, roomName, ip, acDeviceType) {
         this.ip = ip;
@@ -19,7 +19,7 @@ class AcDevice {
         this.currentConsumption = -1;
         this.energyConsumerSettings = new models_1.ExcessEnergyConsumerSettings();
         this.acSettings = new acSettings_1.AcSettings();
-        this.deviceCapabilities = [DeviceCapabilities_1.DeviceCapabilities.ac];
+        this.deviceCapabilities = [DeviceCapability_1.DeviceCapability.ac];
         this._activatedByExcessEnergy = false;
         this._blockAutomaticTurnOnMS = -1;
         this._info = new devices_1.DeviceInfo();

package/lib/server/services/api/api-service.d.ts

@@ -1,4 +1,4 @@
-import { IBaseDevice } from '../../devices';
+import { iBaseDevice } from '../../devices';
 import { RoomBase } from '../../../models';
 import { LogObject } from '../log-service';
 import { AcDevice } from '../ac';
@@ -10,9 +10,9 @@ export declare class API {
      */
     static getAc(id: string): AcDevice | undefined;
     static getDevices(): {
-        [id: string]: IBaseDevice;
+        [id: string]: iBaseDevice;
     };
-    static getDevice(id: string): IBaseDevice;
+    static getDevice(id: string): iBaseDevice;
     static getRooms(): Map<string, RoomBase>;
     static getRoom(id: string): RoomBase | undefined;
     static getLog(): LogObject[];
@@ -33,5 +33,23 @@ export declare class API {
      * @param {boolean} state The desired new state
      * @returns {Error | null} In case it failed the Error containing the reason
      */
-    static setLight(deviceId: string, state: boolean): Error | null;
+    static setLamp(deviceId: string, state: boolean): Error | null;
+    /**
+     * Changes the status of a given actuator
+     * @param {string} deviceId The device Id of the actuator
+     * @param {boolean} state The desired new state
+     * @returns {Error | null} In case it failed the Error containing the reason
+     */
+    static setActuator(deviceId: string, state: boolean): Error | null;
+    /**
+     * Changes the status of a given actuator
+     * @param {string} deviceId The device Id of the actuator
+     * @param {boolean} state The desired new state
+     * @param timeout A chosen Timeout after which the light should be reset
+     * @param brightness The desired brightness
+     * @param transitionTime The transition time during turnOn/turnOff
+     * @returns {Error | null} In case it failed the Error containing the reason
+     */
+    static setDimmer(deviceId: string, state: boolean, timeout?: number, brightness?: number, transitionTime?: number): Error | null;
+    static setShutter(deviceId: string, level: number): Error | null;
 }

package/lib/server/services/api/api-service.js

@@ -6,6 +6,7 @@ const models_1 = require("../../../models");
 const room_service_1 = require("../room-service");
 const log_service_1 = require("../log-service");
 const ac_1 = require("../ac");
+const DeviceCapability_1 = require("../../devices/DeviceCapability");
 class API {
     /**
      * Gets the instance of an Ac Device identified by id
@@ -14,7 +15,7 @@ class API {
      */
     static getAc(id) {
         const result = this.getDevice(id);
-        if ((result === null || result === void 0 ? void 0 : result.deviceType) !== devices_1.DeviceType.Daikin) {
+        if (!result.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.ac)) {
             return undefined;
         }
         return result;
@@ -48,7 +49,11 @@ class API {
     static setAc(id, desiredState) {
         const d = this.getAc(id);
         if (!d) {
-            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Daikin Device for id ${id} not found`);
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `AC Device for id ${id} not found`);
+            return false;
+        }
+        if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.ac)) {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Device for id ${id} is not an ac`);
             return false;
         }
         if (desiredState) {
@@ -72,16 +77,64 @@ class API {
      * @param {boolean} state The desired new state
      * @returns {Error | null} In case it failed the Error containing the reason
      */
-    static setLight(deviceId, state) {
+    static setLamp(deviceId, state) {
         const d = this.getDevice(deviceId);
         if (d === undefined) {
             return new Error(`Device with ID ${deviceId} not found`);
         }
-        if (typeof d.setLight !== 'function') {
+        if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.lamp)) {
             return new Error(`Device with ID ${deviceId} is no Lamp`);
         }
         d.setLight(state, 60 * 60 * 1000, true);
         return null;
     }
+    /**
+     * Changes the status of a given actuator
+     * @param {string} deviceId The device Id of the actuator
+     * @param {boolean} state The desired new state
+     * @returns {Error | null} In case it failed the Error containing the reason
+     */
+    static setActuator(deviceId, state) {
+        const d = this.getDevice(deviceId);
+        if (d === undefined) {
+            return new Error(`Device with ID ${deviceId} not found`);
+        }
+        if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.actuator)) {
+            return new Error(`Device with ID ${deviceId} is no actuator`);
+        }
+        d.setActuator(state, 60 * 60 * 1000, true);
+        return null;
+    }
+    /**
+     * Changes the status of a given actuator
+     * @param {string} deviceId The device Id of the actuator
+     * @param {boolean} state The desired new state
+     * @param timeout A chosen Timeout after which the light should be reset
+     * @param brightness The desired brightness
+     * @param transitionTime The transition time during turnOn/turnOff
+     * @returns {Error | null} In case it failed the Error containing the reason
+     */
+    static setDimmer(deviceId, state, timeout, brightness, transitionTime) {
+        const d = this.getDevice(deviceId);
+        if (d === undefined) {
+            return new Error(`Device with ID ${deviceId} not found`);
+        }
+        if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.dimmablelamp)) {
+            return new Error(`Device with ID ${deviceId} is no dimmablelamp`);
+        }
+        d.setLight(state, timeout, true, brightness, transitionTime);
+        return null;
+    }
+    static setShutter(deviceId, level) {
+        const d = this.getDevice(deviceId);
+        if (d === undefined) {
+            return new Error(`Device with ID ${deviceId} not found`);
+        }
+        if (!d.deviceCapabilities.includes(DeviceCapability_1.DeviceCapability.shutter)) {
+            return new Error(`Device with ID ${deviceId} is no Shutter`);
+        }
+        d.setLevel(level, false);
+        return null;
+    }
 }
 exports.API = API;

package/lib/server/services/room-service/room-service.d.ts

@@ -1,6 +1,6 @@
 import { ringStorage } from '../utils';
 import { iRoomBase, RoomBase } from '../../../models';
-import { IBaseDevice } from '../../devices';
+import { iBaseDevice } from '../../devices';
 export declare class RoomService {
     static Rooms: Map<string, RoomBase>;
     static awayModeActive: boolean;
@@ -25,12 +25,13 @@ export declare class RoomService {
      * !!floor -1 sets all lamps in house instead!!
      * @param floor the level on which all lamps shall be changed -1 equals all rooms
      * @param status
+     * @param timeout
      */
     static setAllLampsOfFloor(floor: number, status?: boolean, timeout?: number): void;
     static clearAllAlarms(): void;
     static startAwayMode(): void;
     static startNightAlarmMode(): void;
-    static startIntrusionAlarm(room: iRoomBase, device: IBaseDevice): void;
+    static startIntrusionAlarm(room: iRoomBase, device: iBaseDevice): void;
     static endAlarmModes(): void;
     static getLastMovements(): string;
     private static stopIntrusionAlarm;

package/lib/server/services/room-service/room-service.js

@@ -32,6 +32,7 @@ class RoomService {
      * !!floor -1 sets all lamps in house instead!!
      * @param floor the level on which all lamps shall be changed -1 equals all rooms
      * @param status
+     * @param timeout
      */
     static setAllLampsOfFloor(floor, status = false, timeout) {
         var _a, _b, _c, _d;