hoffmation-base 1.0.39 → 1.0.43

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-import { Devices, iConfig, ioBrokerMain, OwnSonosDevice } from './server';
+import { Devices, iConfig, ioBrokerMain, ISpeaker } from './server';
 export * from './models/index';
 export * from './server/index';
 export declare class HoffmationInitializationObject {
@@ -8,6 +8,6 @@ export declare class HoffmationInitializationObject {
 export declare class HoffmationBase {
     static ioMain: ioBrokerMain;
     static initializeBeforeIoBroker(initObject: HoffmationInitializationObject): Promise<void>;
-    static initializePostIoBroker(defaultMuellSonos?: OwnSonosDevice): void;
+    static initializePostIoBroker(defaultMuellSonos?: ISpeaker): void;
     static startIoBroker(devices: Devices): void;
 }

package/lib/models/rooms/RoomBase.d.ts

@@ -1,5 +1,5 @@
 import { TimeCallback } from '../timeCallback';
-import { BaseGroup, DeviceCluster, FensterGroup, GroupType, HeatGroup, LampenGroup, PraesenzGroup, SmokeGroup, SonosGroup, TasterGroup, WaterGroup } from '../../server';
+import { BaseGroup, DeviceCluster, FensterGroup, GroupType, HeatGroup, LampenGroup, PraesenzGroup, SmokeGroup, SpeakerGroup, TasterGroup, WaterGroup } from '../../server';
 import { RoomSettings } from './RoomSettings';
 import { iRoomBase } from './iRoomBase';
 import { RoomInfo } from './roomInfo';
@@ -19,7 +19,7 @@ export declare class RoomBase implements iRoomBase {
     get PraesenzGroup(): PraesenzGroup | undefined;
     get LampenGroup(): LampenGroup | undefined;
     get TasterGroup(): TasterGroup | undefined;
-    get SonosGroup(): SonosGroup | undefined;
+    get SonosGroup(): SpeakerGroup | undefined;
     get SmokeGroup(): SmokeGroup | undefined;
     get WaterGroup(): WaterGroup | undefined;
     get HeatGroup(): HeatGroup | undefined;

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

@@ -0,0 +1,15 @@
+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
+}

package/lib/server/devices/DeviceCapabilities.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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 = exports.DeviceCapabilities || (exports.DeviceCapabilities = {}));

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

@@ -5,6 +5,7 @@ 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 {
     protected _info: IoBrokerDeviceInfo;
     deviceType: DeviceType;
@@ -13,6 +14,7 @@ export declare abstract class IoBrokerBaseDevice implements IBaseDevice {
     };
     room: RoomBase | undefined;
     battery: number | undefined;
+    readonly deviceCapabilities: DeviceCapabilities[];
     protected constructor(_info: IoBrokerDeviceInfo, deviceType: DeviceType);
     get id(): string;
     /**

package/lib/server/devices/IoBrokerBaseDevice.js

@@ -9,6 +9,7 @@ class IoBrokerBaseDevice {
         this._info = _info;
         this.deviceType = deviceType;
         this.room = undefined;
+        this.deviceCapabilities = [];
         this.addToCorrectRoom();
     }
     get id() {

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

@@ -0,0 +1,14 @@
+import { AcSettings } from '../../../models/deviceSettings/acSettings';
+import { AcMode } from '../../services';
+export interface iAcDevice {
+    acSettings: AcSettings;
+    readonly on: boolean;
+    /**
+     * Disable automatic Turn-On for given amount of ms and turn off immediately.
+     * @param {number} timeout
+     */
+    deactivateAutomaticTurnOn(timeout: number): void;
+    setDesiredMode(mode: AcMode, writeToDevice: boolean): void;
+    turnOn(): void;
+    turnOff(): void;
+}

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

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

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

@@ -1,10 +1,12 @@
 import { LogLevel, RoomBase } from '../../../models';
 import { DeviceType } from '../deviceType';
 import { DeviceInfo } from '../DeviceInfo';
+import { DeviceCapabilities } from '../DeviceCapabilities';
 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>;

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

@@ -0,0 +1,8 @@
+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;
+    stop(): void;
+    speakOnDevice(pMessage: string, volume?: number, onlyWhenPlaying?: boolean, resolveAfterRevert?: boolean): void;
+}

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

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

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

@@ -1,3 +1,4 @@
+export * from './iAcDevice';
 export * from './iBaseDevice';
 export * from './iButtonSwitch';
 export * from './iEnergyManager';
@@ -8,5 +9,6 @@ export * from './iIlluminationSensor';
 export * from './iLamp';
 export * from './iMotionSensor';
 export * from './iShutter';
+export * from './iSpeaker';
 export * from './iTemperatureSensor';
 export * from './iVibrationSensor';

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

@@ -14,6 +14,7 @@ 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 });
+__exportStar(require("./iAcDevice"), exports);
 __exportStar(require("./iBaseDevice"), exports);
 __exportStar(require("./iButtonSwitch"), exports);
 __exportStar(require("./iEnergyManager"), exports);
@@ -24,5 +25,6 @@ __exportStar(require("./iIlluminationSensor"), exports);
 __exportStar(require("./iLamp"), exports);
 __exportStar(require("./iMotionSensor"), exports);
 __exportStar(require("./iShutter"), exports);
+__exportStar(require("./iSpeaker"), exports);
 __exportStar(require("./iTemperatureSensor"), exports);
 __exportStar(require("./iVibrationSensor"), exports);

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

@@ -1,13 +1,12 @@
 import { DeviceClusterType } from './device-cluster-type';
 import { DeviceList } from './device-list';
 import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
-import { AcDevice, OwnSonosDevice } from '../services';
 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 | OwnSonosDevice | AcDevice>;
+    getDevicesByType(type: DeviceClusterType): Array<IBaseDevice>;
     addByDeviceType(device: IBaseDevice): void;
     addToList(type: DeviceClusterType, device: IBaseDevice): void;
     toJSON(): Partial<DeviceCluster & {

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

@@ -23,6 +23,12 @@ class DeviceCluster {
         const type = device.deviceType;
         const clusterTypes = [device_cluster_type_1.DeviceClusterType.all];
         switch (type) {
+            case deviceType_1.DeviceType.Daikin:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Ac);
+                break;
+            case deviceType_1.DeviceType.Sonos:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Speaker);
+                break;
             case deviceType_1.DeviceType.HmIpLampe:
             case deviceType_1.DeviceType.ZigbeeIlluDimmer:
             case deviceType_1.DeviceType.ZigbeeIlluLampe:

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

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

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

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceList = void 0;
 const services_1 = require("../services");
 class DeviceList {
-    constructor(_ids = [], _isSonos = false) {
+    constructor(_ids = []) {
         this._ids = _ids;
-        this._isSonos = _isSonos;
         // Empty
     }
     get ids() {
@@ -14,17 +13,9 @@ class DeviceList {
     getDevices() {
         const result = [];
         for (const dID of this._ids) {
-            if (this._isSonos) {
-                const s = services_1.OwnSonosDevices.ownDevices[dID];
-                if (s !== undefined) {
-                    result.push(services_1.OwnSonosDevices.ownDevices[dID]);
-                }
-            }
-            else {
-                const d = services_1.API.getDevice(dID);
-                if (d !== undefined) {
-                    result.push(d);
-                }
+            const d = services_1.API.getDevice(dID);
+            if (d !== undefined) {
+                result.push(d);
             }
         }
         return result;

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

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

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

@@ -6,6 +6,6 @@ export * from './heatGroup';
 export * from './lampenGroup';
 export * from './praesenzGroup';
 export * from './smokeGroup';
-export * from './sonosGroup';
+export * from './speakerGroup';
 export * from './tasterGroup';
 export * from './waterGroup';

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

@@ -22,6 +22,6 @@ __exportStar(require("./heatGroup"), exports);
 __exportStar(require("./lampenGroup"), exports);
 __exportStar(require("./praesenzGroup"), exports);
 __exportStar(require("./smokeGroup"), exports);
-__exportStar(require("./sonosGroup"), exports);
+__exportStar(require("./speakerGroup"), exports);
 __exportStar(require("./tasterGroup"), exports);
 __exportStar(require("./waterGroup"), exports);

package/lib/server/devices/groups/{sonosGroup.d.ts → speakerGroup.d.ts}

@@ -1,9 +1,9 @@
-import { OwnSonosDevice } from '../../services';
 import { BaseGroup } from './base-group';
-export declare class SonosGroup extends BaseGroup {
+import { ISpeaker } from '../baseDeviceInterfaces';
+export declare class SpeakerGroup extends BaseGroup {
     private _playing;
     constructor(roomName: string, speakerIds: string[]);
-    getOwnSonosDevices(): OwnSonosDevice[];
+    getOwnSonosDevices(): ISpeaker[];
     playRadio(radioUrl: string): void;
     turnOff(): void;
     trigger(track: string): void;

package/lib/server/devices/groups/{sonosGroup.js → speakerGroup.js}

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SonosGroup = void 0;
+exports.SpeakerGroup = void 0;
 const services_1 = require("../../services");
 const base_group_1 = require("./base-group");
 const device_cluster_type_1 = require("../device-cluster-type");
 const group_type_1 = require("./group-type");
 const device_list_1 = require("../device-list");
-class SonosGroup extends base_group_1.BaseGroup {
+class SpeakerGroup extends base_group_1.BaseGroup {
     constructor(roomName, speakerIds) {
         super(roomName, group_type_1.GroupType.Speaker);
         this._playing = false;
-        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Speaker, new device_list_1.DeviceList(speakerIds, true));
+        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Speaker, new device_list_1.DeviceList(speakerIds));
     }
     getOwnSonosDevices() {
         return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Speaker);
@@ -18,16 +18,14 @@ class SonosGroup extends base_group_1.BaseGroup {
     playRadio(radioUrl) {
         this.getOwnSonosDevices().forEach((s) => {
             services_1.Utils.guardedTimeout(() => {
-                var _a;
-                (_a = s.device) === null || _a === void 0 ? void 0 : _a.SetAVTransportURI(radioUrl);
+                s.playUrl(radioUrl);
             }, 1500);
         });
         this._playing = true;
     }
     turnOff() {
         this.getOwnSonosDevices().forEach((s) => {
-            var _a;
-            (_a = s.device) === null || _a === void 0 ? void 0 : _a.Stop();
+            s.stop();
         });
         this._playing = false;
     }
@@ -39,4 +37,4 @@ class SonosGroup extends base_group_1.BaseGroup {
         this.playRadio(track);
     }
 }
-exports.SonosGroup = SonosGroup;
+exports.SpeakerGroup = SpeakerGroup;

package/lib/server/devices/hmIPDevices/hmIpBewegung.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 DeviceCapabilities_1 = require("../DeviceCapabilities");
 class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         var _a;
@@ -16,6 +17,8 @@ class HmIpBewegung extends hmIpDevice_1.HmIPDevice {
         this._lastMotionTime = 0;
         this._detectionsToday = 0;
         this._currentIllumination = -1;
+        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.motionSensor);
+        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.illuminationSensor);
         (_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, `Bewegungscounter vorinitialisiert mit ${this.detectionsToday}`);

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 DeviceCapabilities_1 = require("../DeviceCapabilities");
 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(DeviceCapabilities_1.DeviceCapabilities.temperatureSensor);
+        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.humiditySensor);
+        this.deviceCapabilities.push(DeviceCapabilities_1.DeviceCapabilities.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 DeviceCapabilities_1 = require("../DeviceCapabilities");
 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(DeviceCapabilities_1.DeviceCapabilities.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 DeviceCapabilities_1 = require("../DeviceCapabilities");
 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(DeviceCapabilities_1.DeviceCapabilities.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 DeviceCapabilities_1 = require("../DeviceCapabilities");
 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(DeviceCapabilities_1.DeviceCapabilities.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 DeviceCapabilities_1 = require("../DeviceCapabilities");
 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(DeviceCapabilities_1.DeviceCapabilities.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 DeviceCapabilities_1 = require("../DeviceCapabilities");
 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(DeviceCapabilities_1.DeviceCapabilities.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 DeviceCapabilities_1 = require("../DeviceCapabilities");
 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(DeviceCapabilities_1.DeviceCapabilities.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/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 DeviceCapabilities_1 = require("../../DeviceCapabilities");
 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(DeviceCapabilities_1.DeviceCapabilities.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 DeviceCapabilities_1 = require("../../DeviceCapabilities");
+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(DeviceCapabilities_1.DeviceCapabilities.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 DeviceCapabilities_1 = require("../../DeviceCapabilities");
 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(DeviceCapabilities_1.DeviceCapabilities.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 DeviceCapabilities_1 = require("../DeviceCapabilities");
+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.occupancyTimeoutID = `${this.info.fullID}.${this.occupancyTimeoutID}`;
     }
     // Time after the last trigger until a motion event gets triggered again