hoffmation-base 1.0.43 → 1.0.44

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

@@ -1,15 +1,17 @@
 export declare enum DeviceCapabilities {
     ac = 0,
-    buttonSwitch = 1,
-    energyManager = 2,
-    excessEnergyConsumer = 3,
-    heater = 4,
-    humiditySensor = 5,
-    illuminationSensor = 6,
-    lamp = 7,
-    motionSensor = 8,
-    shutter = 9,
-    temperatureSensor = 10,
-    vibrationSensor = 11,
-    speaker = 12
+    actuator = 1,
+    buttonSwitch = 2,
+    energyManager = 3,
+    excessEnergyConsumer = 4,
+    heater = 5,
+    humiditySensor = 6,
+    illuminationSensor = 7,
+    lamp = 8,
+    dimmablelamp = 9,
+    motionSensor = 10,
+    shutter = 11,
+    temperatureSensor = 12,
+    vibrationSensor = 13,
+    speaker = 14
 }

package/lib/server/devices/DeviceCapabilities.js

@@ -4,16 +4,18 @@ exports.DeviceCapabilities = void 0;
 var DeviceCapabilities;
 (function (DeviceCapabilities) {
     DeviceCapabilities[DeviceCapabilities["ac"] = 0] = "ac";
-    DeviceCapabilities[DeviceCapabilities["buttonSwitch"] = 1] = "buttonSwitch";
-    DeviceCapabilities[DeviceCapabilities["energyManager"] = 2] = "energyManager";
-    DeviceCapabilities[DeviceCapabilities["excessEnergyConsumer"] = 3] = "excessEnergyConsumer";
-    DeviceCapabilities[DeviceCapabilities["heater"] = 4] = "heater";
-    DeviceCapabilities[DeviceCapabilities["humiditySensor"] = 5] = "humiditySensor";
-    DeviceCapabilities[DeviceCapabilities["illuminationSensor"] = 6] = "illuminationSensor";
-    DeviceCapabilities[DeviceCapabilities["lamp"] = 7] = "lamp";
-    DeviceCapabilities[DeviceCapabilities["motionSensor"] = 8] = "motionSensor";
-    DeviceCapabilities[DeviceCapabilities["shutter"] = 9] = "shutter";
-    DeviceCapabilities[DeviceCapabilities["temperatureSensor"] = 10] = "temperatureSensor";
-    DeviceCapabilities[DeviceCapabilities["vibrationSensor"] = 11] = "vibrationSensor";
-    DeviceCapabilities[DeviceCapabilities["speaker"] = 12] = "speaker";
+    DeviceCapabilities[DeviceCapabilities["actuator"] = 1] = "actuator";
+    DeviceCapabilities[DeviceCapabilities["buttonSwitch"] = 2] = "buttonSwitch";
+    DeviceCapabilities[DeviceCapabilities["energyManager"] = 3] = "energyManager";
+    DeviceCapabilities[DeviceCapabilities["excessEnergyConsumer"] = 4] = "excessEnergyConsumer";
+    DeviceCapabilities[DeviceCapabilities["heater"] = 5] = "heater";
+    DeviceCapabilities[DeviceCapabilities["humiditySensor"] = 6] = "humiditySensor";
+    DeviceCapabilities[DeviceCapabilities["illuminationSensor"] = 7] = "illuminationSensor";
+    DeviceCapabilities[DeviceCapabilities["lamp"] = 8] = "lamp";
+    DeviceCapabilities[DeviceCapabilities["dimmablelamp"] = 9] = "dimmablelamp";
+    DeviceCapabilities[DeviceCapabilities["motionSensor"] = 10] = "motionSensor";
+    DeviceCapabilities[DeviceCapabilities["shutter"] = 11] = "shutter";
+    DeviceCapabilities[DeviceCapabilities["temperatureSensor"] = 12] = "temperatureSensor";
+    DeviceCapabilities[DeviceCapabilities["vibrationSensor"] = 13] = "vibrationSensor";
+    DeviceCapabilities[DeviceCapabilities["speaker"] = 14] = "speaker";
 })(DeviceCapabilities = exports.DeviceCapabilities || (exports.DeviceCapabilities = {}));

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

@@ -1,12 +1,12 @@
 /// <reference types="iobroker" />
-import { IBaseDevice } from './baseDeviceInterfaces';
+import { iBaseDevice } from './baseDeviceInterfaces';
 import { LogDebugType } from '../services';
 import { LogLevel, RoomBase, RoomDeviceAddingSettings } from '../../models';
 import { IOBrokerConnection } from '../ioBroker';
 import { DeviceType } from './deviceType';
 import { IoBrokerDeviceInfo } from './IoBrokerDeviceInfo';
 import { DeviceCapabilities } from './DeviceCapabilities';
-export declare abstract class IoBrokerBaseDevice implements IBaseDevice {
+export declare abstract class IoBrokerBaseDevice implements iBaseDevice {
     protected _info: IoBrokerDeviceInfo;
     deviceType: DeviceType;
     static roomAddingSettings: {

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

@@ -0,0 +1,15 @@
+import { ActuatorSettings } from '../../../models';
+import { iBaseDevice } from './iBaseDevice';
+export interface iActuator extends iBaseDevice {
+    settings: ActuatorSettings;
+    actuatorOn: boolean;
+    /**
+     * Controls the power state of this actuator
+     * @param {boolean} pValue the new desired State
+     * @param {number} timeout if positive the time in ms, after which state should reset
+     * @param {boolean} force if true, this command isn't overwritten by automatic actions
+     * Accessible in API
+     */
+    setActuator(pValue: boolean, timeout?: number, force?: boolean): void;
+    toggleActuator(force: boolean): boolean;
+}

package/lib/server/devices/baseDeviceInterfaces/iActuator.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -2,12 +2,12 @@ import { LogLevel, RoomBase } from '../../../models';
 import { DeviceType } from '../deviceType';
 import { DeviceInfo } from '../DeviceInfo';
 import { DeviceCapabilities } from '../DeviceCapabilities';
-export interface IBaseDevice {
+export interface iBaseDevice {
     room: RoomBase | undefined;
     deviceType: DeviceType;
     info: DeviceInfo;
     readonly deviceCapabilities: DeviceCapabilities[];
     readonly id: string;
     log(level: LogLevel, message: string): void;
-    toJSON(): Partial<IBaseDevice>;
+    toJSON(): Partial<iBaseDevice>;
 }

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

@@ -1,6 +1,6 @@
 import { Button } from '../button';
-import { IBaseDevice } from './iBaseDevice';
-export interface iButtonSwitch extends IBaseDevice {
+import { iBaseDevice } from './iBaseDevice';
+export interface iButtonSwitch extends iBaseDevice {
     buttonTopLeft: Button | undefined;
     buttonTopRight: Button | undefined;
     buttonMidLeft: Button | undefined;

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

@@ -0,0 +1,16 @@
+import { iLamp } from './iLamp';
+import { DimmerSettings, TimeOfDay } from '../../../models';
+export interface iDimmableLamp extends iLamp {
+    settings: DimmerSettings;
+    toggleLight(time: TimeOfDay, force: boolean, calculateTime: boolean): void;
+    /**
+     * This function sets the light to a specific value
+     * @param pValue The desired value
+     * @param timeout A chosen Timeout after which the light should be reset
+     * @param force Wether it is a action based on a user action, to override certain rules
+     * @param brightness The desired brightness
+     * @param transitionTime The transition time during turnOn/turnOff
+     * Accessible in API
+     */
+    setLight(pValue: boolean, timeout?: number, force?: boolean, brightness?: number, transitionTime?: number): void;
+}

package/lib/server/devices/baseDeviceInterfaces/iDimmableLamp.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,5 +1,5 @@
 import { iExcessEnergyConsumer } from './iExcessEnergyConsumer';
-import { IBaseDevice } from './iBaseDevice';
+import { iBaseDevice } from './iBaseDevice';
 export declare class PhaseState {
     private readonly _meterValue;
     private readonly _production;
@@ -13,7 +13,7 @@ export declare class PhaseState {
     get injectingWattage(): number;
     get totalConsumptionWattage(): number;
 }
-export interface iEnergyManager extends IBaseDevice {
+export interface iEnergyManager extends iBaseDevice {
     baseConsumption: number;
     currentProduction: number;
     excessEnergy: number;

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

@@ -0,0 +1,9 @@
+import { FensterPosition } from '../models';
+import { iBaseDevice } from './iBaseDevice';
+export interface iHandleSensor extends iBaseDevice {
+    position: FensterPosition;
+    minutesOpen: number;
+    addOffenCallback(pCallback: (pValue: boolean) => void): void;
+    addKippCallback(pCallback: (pValue: boolean) => void): void;
+    addClosedCallback(pCallback: (pValue: boolean) => void): void;
+}

package/lib/server/devices/baseDeviceInterfaces/iHandleSensor.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,6 +1,6 @@
 import { HeaterSettings, TemperatureSettings } from '../../../models';
-import { IBaseDevice } from './iBaseDevice';
-export interface iHeater extends IBaseDevice {
+import { iBaseDevice } from './iBaseDevice';
+export interface iHeater extends iBaseDevice {
     settings: HeaterSettings;
     readonly desiredTemperature: number;
     readonly humidity: number;

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

@@ -1,6 +1,6 @@
-import { IBaseDevice } from './iBaseDevice';
+import { iBaseDevice } from './iBaseDevice';
 export declare const UNDEFINED_HUMIDITY_VALUE = -1;
-export interface iHumiditySensor extends IBaseDevice {
+export interface iHumiditySensor extends iBaseDevice {
     humidity: number;
     addHumidityCallback(pCallback: (pValue: number) => void): void;
 }

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

@@ -1,9 +1,8 @@
-import { ActuatorSettings, RoomBase, TimeOfDay } from '../../../models';
-import { IBaseDevice } from './iBaseDevice';
-export interface iLamp extends IBaseDevice {
+import { ActuatorSettings, TimeOfDay } from '../../../models';
+import { iBaseDevice } from './iBaseDevice';
+export interface iLamp extends iBaseDevice {
     settings: ActuatorSettings;
     lightOn: boolean;
-    room: RoomBase | undefined;
     setTimeBased(time: TimeOfDay, timeout: number, force: boolean): void;
     toggleLight(time: TimeOfDay, force: boolean, calculateTime: boolean): void;
     /**
@@ -11,6 +10,7 @@ export interface iLamp extends IBaseDevice {
      * @param pValue The desired value
      * @param timeout A chosen Timeout after which the light should be reset
      * @param force Wether it is a action based on a user action, to override certain rules
+     * Accessible in API
      */
     setLight(pValue: boolean, timeout: number, force: boolean): void;
 }

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

@@ -1,6 +1,6 @@
 import { MotionSensorSettings } from '../../../models';
-import { IBaseDevice } from './iBaseDevice';
-export interface iMotionSensor extends IBaseDevice {
+import { iBaseDevice } from './iBaseDevice';
+export interface iMotionSensor extends iBaseDevice {
     settings: MotionSensorSettings;
     movementDetected: boolean;
     readonly timeSinceLastMotion: number;

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

@@ -1,6 +1,6 @@
 import { Fenster } from '../groups';
-import { IBaseDevice } from './iBaseDevice';
-export interface iShutter extends IBaseDevice {
+import { iBaseDevice } from './iBaseDevice';
+export interface iShutter extends iBaseDevice {
     currentLevel: number;
     desiredFensterLevel: number;
     fenster: Fenster | undefined;

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

@@ -1,5 +1,5 @@
-import { IBaseDevice } from './iBaseDevice';
-export interface ISpeaker extends IBaseDevice {
+import { iBaseDevice } from './iBaseDevice';
+export interface ISpeaker extends iBaseDevice {
     playOnDevice(mp3Name: string, duration: number, volume?: number, onlyWhenPlaying?: boolean, resolveAfterRevert?: boolean): void;
     playTestMessage(): void;
     playUrl(url: string): void;

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

@@ -1,6 +1,6 @@
-import { IBaseDevice } from './iBaseDevice';
+import { iBaseDevice } from './iBaseDevice';
 export declare const UNDEFINED_TEMP_VALUE = -99;
-export interface iTemperatureSensor extends IBaseDevice {
+export interface iTemperatureSensor extends iBaseDevice {
     iTemperature: number;
     sTemperature: string;
     addTempChangeCallback(pCallback: (pValue: number) => void): void;

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

@@ -1,5 +1,5 @@
-import { IBaseDevice } from './iBaseDevice';
-export interface iVibrationSensor extends IBaseDevice {
+import { iBaseDevice } from './iBaseDevice';
+export interface iVibrationSensor extends iBaseDevice {
     vibrationBlockedByGriff: boolean;
     vibrationBlockedByGriffTimeStamp: number;
     vibrationBlockedByMotion: boolean;

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

@@ -1,8 +1,10 @@
 export * from './iAcDevice';
+export * from './iActuator';
 export * from './iBaseDevice';
 export * from './iButtonSwitch';
 export * from './iEnergyManager';
 export * from './iExcessEnergyConsumer';
+export * from './iHandleSensor';
 export * from './iHeater';
 export * from './iHumiditySensor';
 export * from './iIlluminationSensor';

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

@@ -15,10 +15,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./iAcDevice"), exports);
+__exportStar(require("./iActuator"), exports);
 __exportStar(require("./iBaseDevice"), exports);
 __exportStar(require("./iButtonSwitch"), exports);
 __exportStar(require("./iEnergyManager"), exports);
 __exportStar(require("./iExcessEnergyConsumer"), exports);
+__exportStar(require("./iHandleSensor"), exports);
 __exportStar(require("./iHeater"), exports);
 __exportStar(require("./iHumiditySensor"), exports);
 __exportStar(require("./iIlluminationSensor"), exports);

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

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

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

@@ -1,7 +1,7 @@
-import { IBaseDevice } from './baseDeviceInterfaces';
+import { iBaseDevice } from './baseDeviceInterfaces';
 export declare class DeviceList {
     private _ids;
     constructor(_ids?: string[]);
     get ids(): string[];
-    getDevices(): Array<IBaseDevice>;
+    getDevices(): Array<iBaseDevice>;
 }

package/lib/server/devices/deviceUpdater.js

@@ -17,6 +17,7 @@ class DeviceUpdater {
         }
     }
     updateState(id, state, initial = false) {
+        var _a;
         if (state === null) {
             // Ignore null states
             return;
@@ -32,7 +33,7 @@ class DeviceUpdater {
             device.update(idSplit, state, initial, false);
         }
         catch (e) {
-            services_1.ServerLogService.writeLog(models_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 ${(_a = e === null || e === void 0 ? void 0 : e.stack) !== null && _a !== void 0 ? _a : ''}`);
         }
     }
 }

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

@@ -1,12 +1,12 @@
 import { deviceConfig, iRoomImportEnforcer } from '../../models';
-import { IBaseDevice, iEnergyManager } from './baseDeviceInterfaces';
+import { iBaseDevice, iEnergyManager } from './baseDeviceInterfaces';
 export declare class Devices {
     static IDENTIFIER_HOMEMATIC: string;
     static IDENTIFIER_JS: string;
     static IDENTIFIER_ZIGBEE: string;
     static IDENTIFIER_WLED: string;
     static alLDevices: {
-        [id: string]: IBaseDevice;
+        [id: string]: iBaseDevice;
     };
     static energymanager?: iEnergyManager;
     constructor(pDeviceData: {

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

@@ -1,6 +1,6 @@
-import { ZigbeeIkeaSteckdose, ZigbeeIlluLedRGBCCT } from '../zigbee';
+import { ZigbeeIlluLedRGBCCT } from '../zigbee';
 import { BaseGroup } from './base-group';
-import { iLamp } from '../baseDeviceInterfaces';
+import { iActuator, iLamp } from '../baseDeviceInterfaces';
 import { TimeOfDay } from '../../../models';
 import { WledDevice } from '../wledDevice';
 export declare class LampenGroup extends BaseGroup {
@@ -9,7 +9,7 @@ export declare class LampenGroup extends BaseGroup {
     getLampen(): iLamp[];
     getLED(): ZigbeeIlluLedRGBCCT[];
     getWled(): WledDevice[];
-    getStecker(): ZigbeeIkeaSteckdose[];
+    getStecker(): iActuator[];
     handleSunriseOff(): void;
     switchAll(target: boolean, force?: boolean): void;
     switchTimeConditional(time: TimeOfDay): void;

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

@@ -28,7 +28,7 @@ class LampenGroup extends base_group_1.BaseGroup {
             }
         }
         for (i = 0; i < this.getStecker().length; i++) {
-            if (this.getStecker()[i].steckerOn) {
+            if (this.getStecker()[i].actuatorOn) {
                 return true;
             }
         }
@@ -49,7 +49,7 @@ class LampenGroup extends base_group_1.BaseGroup {
         return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.WLED);
     }
     getStecker() {
-        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.Outlets);
+        return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Outlets);
     }
     handleSunriseOff() {
         if (!this.anyLightsOn()) {
@@ -120,7 +120,7 @@ class LampenGroup extends base_group_1.BaseGroup {
                 (time === models_1.TimeOfDay.BeforeSunrise && s.settings.dawnOn) ||
                 (time === models_1.TimeOfDay.AfterSunset && s.settings.duskOn)) {
                 const timeout = pValue && force ? 30 * 60 * 1000 : -1;
-                s.setStecker(pValue, timeout, force);
+                s.setActuator(pValue, timeout, force);
             }
         });
     }

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

@@ -1,16 +1,17 @@
 /// <reference types="iobroker" />
-import { HmIPDevice } from './hmIpDevice';
 import { FensterPosition } from '../models';
 import { Fenster } from '../groups';
 import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-export declare class HmIpGriff extends HmIPDevice {
+import { HmIPDevice } from './hmIpDevice';
+import { iHandleSensor } from '../baseDeviceInterfaces';
+export declare class HmIpGriff extends HmIPDevice implements iHandleSensor {
     position: FensterPosition;
     private _kippCallback;
     private _closedCallback;
     private _offenCallback;
     private _iOpenTimeout;
-    private minutesOpen;
+    minutesOpen: number;
     private _fenster;
     private _helpingRoomTemp;
     constructor(pInfo: IoBrokerDeviceInfo);

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

@@ -4,12 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpGriff = void 0;
-const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
 const services_1 = require("../../services");
 const models_1 = require("../models");
 const models_2 = require("../../../models");
 const lodash_1 = __importDefault(require("lodash"));
+const hmIpDevice_1 = require("./hmIpDevice");
 class HmIpGriff extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpGriff);

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

@@ -1,13 +1,14 @@
 /// <reference types="iobroker" />
 import { ActuatorSettings } from '../../../../models';
-import { ZigbeeDevice } from './zigbeeDevice';
 import { DeviceType } from '../../deviceType';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
-export declare class ZigbeeActuator extends ZigbeeDevice {
+import { iActuator } from '../../baseDeviceInterfaces';
+import { ZigbeeDevice } from './zigbeeDevice';
+export declare class ZigbeeActuator extends ZigbeeDevice implements iActuator {
     settings: ActuatorSettings;
     protected readonly actuatorOnSwitchID: string;
     protected queuedValue: boolean | null;
-    protected actuatorOn: boolean;
+    actuatorOn: boolean;
     private _turnOffTimeout;
     private turnOffTime;
     constructor(pInfo: IoBrokerDeviceInfo, type: DeviceType, actuatorOnSwitchID: string);

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

@@ -4,6 +4,7 @@ exports.ZigbeeActuator = void 0;
 const services_1 = require("../../../services");
 const models_1 = require("../../../../models");
 const zigbeeDevice_1 = require("./zigbeeDevice");
+const DeviceCapabilities_1 = require("../../DeviceCapabilities");
 class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, type, actuatorOnSwitchID) {
         super(pInfo, type);
@@ -12,6 +13,7 @@ class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
         this.actuatorOn = false;
         this._turnOffTimeout = undefined;
         this.turnOffTime = 0;
+        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.actuator);
         this.actuatorOnSwitchID = actuatorOnSwitchID;
     }
     update(idSplit, state, initial = false, handledByChildObject = false) {

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

@@ -20,6 +20,7 @@ class ZigbeeIlluDimmer extends BaseDevices_1.ZigbeeDevice {
         this._turnOffTimeout = undefined;
         this.turnOffTime = 0;
         this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.lamp);
+        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.dimmablelamp);
         this.stateID = `${this.info.fullID}.state`;
         this.brightnessID = `${this.info.fullID}.brightness`;
         this.transitionID = `${this.info.fullID}.transition_time`;

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

@@ -1,11 +1,11 @@
-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 {
+export declare abstract class AcDevice implements iExcessEnergyConsumer, iBaseDevice, iAcDevice {
     ip: string;
     acDeviceType: AcDeviceType;
     currentConsumption: number;

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,22 @@ 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;
 }