hoffmation-base 1.0.41 → 1.0.45

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/hmIPDevices/hmIpHeizgruppe.js

@@ -7,6 +7,7 @@ const services_1 = require("../../services");
 const models_1 = require("../../../models");
 const baseDeviceInterfaces_1 = require("../baseDeviceInterfaces");
 const device_cluster_type_1 = require("../device-cluster-type");
+const DeviceCapability_1 = require("../DeviceCapability");
 class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpHeizgruppe);
@@ -22,6 +23,9 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         this._humidity = baseDeviceInterfaces_1.UNDEFINED_HUMIDITY_VALUE;
         this._desiredTemperature = 0;
         this._roomTemperatur = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.temperatureSensor);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.humiditySensor);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.heater);
         this._setPointTemperatureID = `${this.info.fullID}.1.SET_POINT_TEMPERATURE`;
         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, () => {

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

@@ -5,6 +5,7 @@ const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
 const services_1 = require("../../services");
 const models_1 = require("../../../models");
+const DeviceCapability_1 = require("../DeviceCapability");
 class HmIpLampe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpLampe);
@@ -14,6 +15,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
         this.lightOnSwitchID = '';
         this._turnOffTimeout = undefined;
         this.turnOffTime = 0;
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
         this.lightOnSwitchID = `${this.info.fullID}.2.STATE`;
     }
     update(idSplit, state, initial = false) {

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

@@ -5,6 +5,7 @@ const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
 const services_1 = require("../../services");
+const DeviceCapability_1 = require("../DeviceCapability");
 class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         var _a;
@@ -16,6 +17,7 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
         this.initialized = false;
         this._detectionsToday = 0;
         this._currentIllumination = -1;
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.illuminationSensor);
         // this.presenceStateID = `${this.info.fullID}.1.${HmIpPraezenz.PRESENCE_DETECTION}`;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.getCount(this).then((todayCount) => {
             this.detectionsToday = todayCount.counter;
@@ -86,6 +88,7 @@ class HmIpPraezenz extends hmIpDevice_1.HmIPDevice {
     }
 }
 exports.HmIpPraezenz = HmIpPraezenz;
+// TODO: Add iPresenceSensor
 HmIpPraezenz.PRESENCE_DETECTION = 'PRESENCE_DETECTION_STATE';
 // private static ILLUMINATION_DURING_MOVEMENT: string = 'CURRENT_ILLUMINATION';
 HmIpPraezenz.CURRENT_ILLUMINATION = 'ILLUMINATION';

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

@@ -10,6 +10,7 @@ const services_1 = require("../../services");
 const models_1 = require("../models");
 const models_2 = require("../../../models");
 const lodash_1 = __importDefault(require("lodash"));
+const DeviceCapability_1 = require("../DeviceCapability");
 class HmIpRoll extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpRoll);
@@ -17,6 +18,7 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
         this._setLevel = -1;
         this._setLevelTime = -1;
         this._currentLevel = -1;
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.shutter);
         this._setLevelSwitchID = `${this.info.fullID}.4.LEVEL`;
     }
     get currentLevel() {

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

@@ -5,6 +5,7 @@ const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
 const button_1 = require("../button");
 const models_1 = require("../../../models");
+const DeviceCapability_1 = require("../DeviceCapability");
 class HmIpTaster extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpTaster);
@@ -16,6 +17,7 @@ class HmIpTaster extends hmIpDevice_1.HmIPDevice {
         this.buttonBotRight = new button_1.Button('BotRight', HmIpTaster.BUTTON_CAPABILLITIES);
         this.buttonBot = undefined;
         this.buttonTop = undefined;
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.buttonSwitch);
     }
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Taster Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);

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

@@ -5,11 +5,13 @@ const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
 const button_1 = require("../button");
 const models_1 = require("../../../models");
+const DeviceCapability_1 = require("../DeviceCapability");
 class HmIpWippe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpWippe);
         this.buttonBot = new button_1.Button('Bottom', HmIpWippe.BUTTON_CAPABILLITIES);
         this.buttonTop = new button_1.Button('Top', HmIpWippe.BUTTON_CAPABILLITIES);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.buttonSwitch);
     }
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Wippe Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);

package/lib/server/devices/jsObject/jsObjectEnergyManager.js

@@ -6,6 +6,7 @@ const baseDeviceInterfaces_1 = require("../baseDeviceInterfaces");
 const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
 const services_1 = require("../../services");
+const DeviceCapability_1 = require("../DeviceCapability");
 class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     constructor(info) {
         super(info, deviceType_1.DeviceType.JsEnergyManager);
@@ -22,6 +23,7 @@ class JsObjectEnergyManager extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         this._phaseAState = new baseDeviceInterfaces_1.PhaseState(0, 0);
         this._phaseBState = new baseDeviceInterfaces_1.PhaseState(0, 0);
         this._phaseCState = new baseDeviceInterfaces_1.PhaseState(0, 0);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.energyManager);
         this.log(models_1.LogLevel.Info, `Creating Energy Manager Device`);
         this._iCalculationInterval = services_1.Utils.guardedInterval(() => {
             this.calculateExcessEnergy();

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 DeviceCapability_1 = require("../../DeviceCapability");
 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(DeviceCapability_1.DeviceCapability.actuator);
         this.actuatorOnSwitchID = actuatorOnSwitchID;
     }
     update(idSplit, state, initial = false, handledByChildObject = false) {

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

@@ -2,5 +2,6 @@ export * from './ZigbeeActuator';
 export * from './zigbeeDevice';
 export * from './zigbeeHeater';
 export * from './zigbeeMagnetContact';
+export * from './zigbeeMotionSensor';
 export * from './zigbeeShutter';
 export * from './zigbeeSwitch';

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

@@ -18,5 +18,6 @@ __exportStar(require("./ZigbeeActuator"), exports);
 __exportStar(require("./zigbeeDevice"), exports);
 __exportStar(require("./zigbeeHeater"), exports);
 __exportStar(require("./zigbeeMagnetContact"), exports);
+__exportStar(require("./zigbeeMotionSensor"), exports);
 __exportStar(require("./zigbeeShutter"), exports);
 __exportStar(require("./zigbeeSwitch"), exports);

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

@@ -5,6 +5,7 @@ const zigbeeDevice_1 = require("./zigbeeDevice");
 const baseDeviceInterfaces_1 = require("../../baseDeviceInterfaces");
 const models_1 = require("../../../../models");
 const services_1 = require("../../../services");
+const DeviceCapability_1 = require("../../DeviceCapability");
 class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, pType) {
         super(pInfo, pType);
@@ -18,6 +19,7 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         this._seasonTurnOff = false;
         this._humidity = 0;
         this._roomTemperatur = 0;
+        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/{zigbeeMotionSensor.d.ts → BaseDevices/zigbeeMotionSensor.d.ts}

@@ -1,10 +1,10 @@
 /// <reference types="node" />
 /// <reference types="iobroker" />
-import { DeviceType } from '../deviceType';
-import { ZigbeeDevice } from './BaseDevices';
-import { MotionSensorSettings } from '../../../models';
-import { iMotionSensor } from '../baseDeviceInterfaces';
-import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
+import { DeviceType } from '../../deviceType';
+import { ZigbeeDevice } from './index';
+import { MotionSensorSettings } from '../../../../models';
+import { iMotionSensor } from '../../baseDeviceInterfaces';
+import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionSensor {
     settings: MotionSensorSettings;
     movementDetected: boolean;

package/lib/server/devices/zigbee/{zigbeeMotionSensor.js → BaseDevices/zigbeeMotionSensor.js}

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeMotionSensor = void 0;
-const BaseDevices_1 = require("./BaseDevices");
-const models_1 = require("../../../models");
-const services_1 = require("../../services");
-class ZigbeeMotionSensor extends BaseDevices_1.ZigbeeDevice {
+const index_1 = require("./index");
+const models_1 = require("../../../../models");
+const services_1 = require("../../../services");
+const DeviceCapability_1 = require("../../DeviceCapability");
+class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
     constructor(pInfo, type) {
         var _a;
         super(pInfo, type);
@@ -15,6 +16,7 @@ class ZigbeeMotionSensor extends BaseDevices_1.ZigbeeDevice {
         this._needsMovementResetFallback = true;
         this._timeSinceLastMotion = 0;
         this._detectionsToday = 0;
+        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,6 +9,7 @@ const models_1 = require("../../../../models");
 const zigbeeDevice_1 = require("./zigbeeDevice");
 const models_2 = require("../../models");
 const lodash_1 = __importDefault(require("lodash"));
+const DeviceCapability_1 = require("../../DeviceCapability");
 class ZigbeeShutter extends zigbeeDevice_1.ZigbeeDevice {
     constructor(pInfo, pType) {
         var _a;
@@ -20,6 +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(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/index.d.ts

@@ -13,7 +13,6 @@ export * from './zigbeeIlluDimmer';
 export * from './zigbeeIlluLampe';
 export * from './zigbeeIlluLedRGBCCT';
 export * from './zigbeeIlluShutter';
-export * from './zigbeeMotionSensor';
 export * from './zigbeeSMaBiTMagnetContact';
 export * from './zigbeeSonoffMotion';
 export * from './zigbeeSonoffTemp';

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

@@ -29,7 +29,6 @@ __exportStar(require("./zigbeeIlluDimmer"), exports);
 __exportStar(require("./zigbeeIlluLampe"), exports);
 __exportStar(require("./zigbeeIlluLedRGBCCT"), exports);
 __exportStar(require("./zigbeeIlluShutter"), exports);
-__exportStar(require("./zigbeeMotionSensor"), exports);
 __exportStar(require("./zigbeeSMaBiTMagnetContact"), exports);
 __exportStar(require("./zigbeeSonoffMotion"), exports);
 __exportStar(require("./zigbeeSonoffTemp"), exports);

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

@@ -1,6 +1,6 @@
 /// <reference types="iobroker" />
 import { iIlluminationSensor } from '../baseDeviceInterfaces';
-import { ZigbeeMotionSensor } from './zigbeeMotionSensor';
+import { ZigbeeMotionSensor } from './BaseDevices';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeAquaraMotion extends ZigbeeMotionSensor implements iIlluminationSensor {
     private _illuminance;

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

@@ -3,14 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeAquaraMotion = void 0;
 const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
-const zigbeeMotionSensor_1 = require("./zigbeeMotionSensor");
+const BaseDevices_1 = require("./BaseDevices");
 const services_1 = require("../../services");
-class ZigbeeAquaraMotion extends zigbeeMotionSensor_1.ZigbeeMotionSensor {
+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(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,6 +5,7 @@ const deviceType_1 = require("../deviceType");
 const services_1 = require("../../services");
 const models_1 = require("../../../models");
 const BaseDevices_1 = require("./BaseDevices");
+const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeAquaraVibra);
@@ -23,6 +24,7 @@ class ZigbeeAquaraVibra extends BaseDevices_1.ZigbeeDevice {
         // TODO Set Sensitivity
         this._vibrationBlockedByGriff = false;
         this._vibrationBlockedByMotion = false;
+        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,6 +4,7 @@ exports.ZigbeeBlitzShp = void 0;
 const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
 const BaseDevices_1 = require("./BaseDevices");
+const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeBlitzShp extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeBlitzShp);
@@ -16,6 +17,7 @@ class ZigbeeBlitzShp extends BaseDevices_1.ZigbeeDevice {
         this._availableForExcessEnergy = true;
         this.steckerOnSwitchID = '';
         this._activatedByExcessEnergy = false;
+        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,6 +5,7 @@ const models_1 = require("../../../models");
 const deviceType_1 = require("../deviceType");
 const services_1 = require("../../services");
 const BaseDevices_1 = require("./BaseDevices");
+const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeIlluDimmer extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeIlluDimmer);
@@ -18,6 +19,8 @@ class ZigbeeIlluDimmer extends BaseDevices_1.ZigbeeDevice {
         this.transitionID = 'transition_time';
         this._turnOffTimeout = undefined;
         this.turnOffTime = 0;
+        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,9 +5,11 @@ const deviceType_1 = require("../deviceType");
 const zigbeeIlluActuator_1 = require("./zigbeeIlluActuator");
 const models_1 = require("../../../models");
 const services_1 = require("../../services");
+const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeIlluLampe extends zigbeeIlluActuator_1.ZigbeeIlluActuator {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeIlluLampe);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
     }
     get lightOn() {
         return super.actuatorOn;

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

@@ -1,5 +1,5 @@
 /// <reference types="iobroker" />
-import { ZigbeeMotionSensor } from './zigbeeMotionSensor';
+import { ZigbeeMotionSensor } from './BaseDevices';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeSonoffMotion extends ZigbeeMotionSensor {
     constructor(pInfo: IoBrokerDeviceInfo);

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

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeSonoffMotion = void 0;
 const deviceType_1 = require("../deviceType");
 const models_1 = require("../../../models");
-const zigbeeMotionSensor_1 = require("./zigbeeMotionSensor");
-class ZigbeeSonoffMotion extends zigbeeMotionSensor_1.ZigbeeMotionSensor {
+const BaseDevices_1 = require("./BaseDevices");
+class ZigbeeSonoffMotion extends BaseDevices_1.ZigbeeMotionSensor {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeSonoffMotion);
         this._needsMovementResetFallback = false;

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

@@ -4,6 +4,7 @@ exports.ZigbeeSonoffTemp = void 0;
 const BaseDevices_1 = require("./BaseDevices");
 const baseDeviceInterfaces_1 = require("../baseDeviceInterfaces");
 const deviceType_1 = require("../deviceType");
+const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeSonoffTemp);
@@ -11,6 +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(DeviceCapability_1.DeviceCapability.temperatureSensor);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.humiditySensor);
     }
     get humidity() {
         return this._humidity;

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

@@ -2,7 +2,7 @@
 import { ZigbeeShutter } from './BaseDevices';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeUbisysShutter extends ZigbeeShutter {
-    private _positionStateId;
+    private readonly _positionStateId;
     constructor(pInfo: IoBrokerDeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     protected moveToPosition(pPosition: number): void;

package/lib/server/services/Sonos/OwnSonosDevices.d.ts

@@ -1,4 +1,4 @@
-import { OwnSonosDevice } from './sonos-service';
+import { OwnSonosDevice } from './own-sonos-device';
 export declare class OwnSonosDevices {
     static ownDevices: {
         [name: string]: OwnSonosDevice;

package/lib/server/services/Sonos/OwnSonosDevices.js

@@ -6,7 +6,7 @@ const models_1 = require("../../../models");
 class OwnSonosDevices {
     static addDevice(device) {
         log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Device ${device.name} for room "${device.info.room}" addded`);
-        this.ownDevices[device.name] = device;
+        this.ownDevices[device.discoveryName] = device;
     }
 }
 exports.OwnSonosDevices = OwnSonosDevices;

package/lib/server/services/Sonos/index.d.ts

@@ -2,3 +2,4 @@ export * from './mp3-server';
 export * from './OwnSonosDevices';
 export * from './polly-service';
 export * from './sonos-service';
+export { OwnSonosDevice } from './own-sonos-device';

package/lib/server/services/Sonos/index.js

@@ -14,7 +14,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.OwnSonosDevice = void 0;
 __exportStar(require("./mp3-server"), exports);
 __exportStar(require("./OwnSonosDevices"), exports);
 __exportStar(require("./polly-service"), exports);
 __exportStar(require("./sonos-service"), exports);
+var own_sonos_device_1 = require("./own-sonos-device");
+Object.defineProperty(exports, "OwnSonosDevice", { enumerable: true, get: function () { return own_sonos_device_1.OwnSonosDevice; } });

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

@@ -0,0 +1,26 @@
+import { DeviceInfo, DeviceType, ISpeaker } from '../../devices';
+import { LogLevel, RoomBase } from '../../../models';
+import { SonosDevice } from '@svrooij/sonos/lib';
+import { LogDebugType } from '../log-service';
+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: DeviceCapability[];
+    constructor(discoveryName: string, roomName: string, device: SonosDevice | undefined);
+    protected _info: DeviceInfo;
+    get info(): DeviceInfo;
+    set info(info: DeviceInfo);
+    get id(): string;
+    get name(): string;
+    playOnDevice(mp3Name: string, duration: number, volume?: number | undefined, onlyWhenPlaying?: boolean | undefined, resolveAfterRevert?: boolean | undefined): void;
+    playTestMessage(): void;
+    speakOnDevice(pMessage: string, volume?: number | undefined, onlyWhenPlaying?: boolean | undefined, resolveAfterRevert?: boolean | undefined): void;
+    stop(): void;
+    playUrl(url: string): void;
+    log(level: LogLevel, message: string, debugType?: LogDebugType): void;
+    toJSON(): Partial<OwnSonosDevice>;
+}