hoffmation-base 0.1.36 → 0.1.37

package/lib/server/config/iConfig.d.ts

@@ -8,7 +8,6 @@ export interface iRestSettings {
     port?: number;
 }
 export interface iConfig {
-    cacheDir?: string;
     ioBrokerUrl: string;
     logSettings?: iLogSettings;
     translationSettings: iTranslationSettings;

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

@@ -0,0 +1,24 @@
+export declare class ButtonCapabilities {
+    shortPress: boolean;
+    doublePress: boolean;
+    triplePress: boolean;
+    longPress: boolean;
+}
+export declare enum ButtonPressType {
+    short = 0,
+    long = 1,
+    double = 2,
+    triple = 3
+}
+export declare class Button {
+    name: string;
+    buttonCapabilities: ButtonCapabilities;
+    private _state;
+    private _callbacks;
+    private _timeouts;
+    getState(type: ButtonPressType): boolean;
+    constructor(name: string, buttonCapabilities: ButtonCapabilities);
+    addCb(buttonType: ButtonPressType, pCallback: (pValue: boolean) => void, description?: string): void;
+    getDescription(): string;
+    updateState(type: ButtonPressType, pValue: boolean): void;
+}

package/lib/server/devices/button.js

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Button = exports.ButtonPressType = exports.ButtonCapabilities = void 0;
+const utils_1 = require("../services/utils/utils");
+const log_service_1 = require("../services/log-service/log-service");
+const logLevel_1 = require("../../models/logLevel");
+class ButtonCapabilities {
+    constructor() {
+        this.shortPress = true;
+        this.doublePress = true;
+        this.triplePress = true;
+        this.longPress = true;
+    }
+}
+exports.ButtonCapabilities = ButtonCapabilities;
+var ButtonPressType;
+(function (ButtonPressType) {
+    ButtonPressType[ButtonPressType["short"] = 0] = "short";
+    ButtonPressType[ButtonPressType["long"] = 1] = "long";
+    ButtonPressType[ButtonPressType["double"] = 2] = "double";
+    ButtonPressType[ButtonPressType["triple"] = 3] = "triple";
+})(ButtonPressType = exports.ButtonPressType || (exports.ButtonPressType = {}));
+class Button {
+    constructor(name, buttonCapabilities) {
+        this.name = name;
+        this.buttonCapabilities = buttonCapabilities;
+        this._state = new Map();
+        this._callbacks = new Map();
+        this._timeouts = new Map();
+        if (buttonCapabilities.shortPress) {
+            this._callbacks.set(ButtonPressType.short, []);
+            this._timeouts.set(ButtonPressType.short, null);
+            this._state.set(ButtonPressType.short, false);
+        }
+        if (buttonCapabilities.longPress) {
+            this._callbacks.set(ButtonPressType.long, []);
+            this._timeouts.set(ButtonPressType.long, null);
+            this._state.set(ButtonPressType.long, false);
+        }
+        if (buttonCapabilities.doublePress) {
+            this._callbacks.set(ButtonPressType.double, []);
+            this._timeouts.set(ButtonPressType.double, null);
+            this._state.set(ButtonPressType.double, false);
+        }
+        if (buttonCapabilities.triplePress) {
+            this._callbacks.set(ButtonPressType.triple, []);
+            this._timeouts.set(ButtonPressType.triple, null);
+            this._state.set(ButtonPressType.triple, false);
+        }
+    }
+    getState(type) {
+        var _a;
+        return (_a = this._state.get(type)) !== null && _a !== void 0 ? _a : false;
+    }
+    addCb(buttonType, pCallback, description = 'Not described') {
+        const cbArr = this._callbacks.get(buttonType);
+        if (cbArr === undefined) {
+            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Error, `This Button doesn't support press Type ${ButtonPressType[buttonType]}`);
+            return;
+        }
+        cbArr.push({ cb: pCallback, description: description });
+    }
+    getDescription() {
+        const description = [];
+        for (const [key, arr] of this._callbacks.entries()) {
+            for (const entry of arr) {
+                description.push(`${ButtonPressType[key]}: "${entry.description}"`);
+            }
+        }
+        return description.join('\n');
+    }
+    updateState(type, pValue) {
+        var _a, _b;
+        if (pValue === this._state.get(type)) {
+            return;
+        }
+        this._state.set(type, pValue);
+        if (!this._callbacks.has(type)) {
+            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Error, `This Button doesn't support press Type ${ButtonPressType[type]}`);
+            return;
+        }
+        for (const c of (_a = this._callbacks.get(type)) !== null && _a !== void 0 ? _a : []) {
+            c.cb(pValue);
+        }
+        if (!pValue) {
+            return;
+        }
+        const timeout = (_b = this._timeouts.get(type)) !== null && _b !== void 0 ? _b : null;
+        if (timeout !== null) {
+            clearTimeout(timeout);
+        }
+        this._timeouts.set(type, utils_1.Utils.guardedTimeout(() => {
+            this.updateState(type, false);
+        }, 5000, this));
+    }
+}
+exports.Button = Button;

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

@@ -28,5 +28,6 @@ export declare enum DeviceType {
     ZigbeeSonoffMotion = 214,
     ZigbeeAqaraMagnetContact = 215,
     ZigbeeSonoffTemp = 216,
+    ZigbeeAqaraOpple3Switch = 217,
     Wled = 1001
 }

package/lib/server/devices/deviceType.js

@@ -32,5 +32,6 @@ var DeviceType;
     DeviceType[DeviceType["ZigbeeSonoffMotion"] = 214] = "ZigbeeSonoffMotion";
     DeviceType[DeviceType["ZigbeeAqaraMagnetContact"] = 215] = "ZigbeeAqaraMagnetContact";
     DeviceType[DeviceType["ZigbeeSonoffTemp"] = 216] = "ZigbeeSonoffTemp";
+    DeviceType[DeviceType["ZigbeeAqaraOpple3Switch"] = 217] = "ZigbeeAqaraOpple3Switch";
     DeviceType[DeviceType["Wled"] = 1001] = "Wled";
 })(DeviceType = exports.DeviceType || (exports.DeviceType = {}));

package/lib/server/devices/devices.js

@@ -34,6 +34,7 @@ const zigbeeSonoffMotion_1 = require("./zigbee/zigbeeSonoffMotion");
 const hmIpAccessPoint_1 = require("./hmIPDevices/hmIpAccessPoint");
 const zigbeeAqaraMagnetContact_1 = require("./zigbee/zigbeeAqaraMagnetContact");
 const zigbeeSonoffTemp_1 = require("./zigbee/zigbeeSonoffTemp");
+const zigbeeAqaraOpple3Switch_1 = require("./zigbee/zigbeeAqaraOpple3Switch");
 class Devices {
     constructor(pDeviceData, pRoomImportEnforcer) {
         // This forces import of rooms at correct timing, to allow devices to land in proper rooms.
@@ -93,6 +94,9 @@ class Devices {
             case 'AqaraMagnetContact':
                 d = new zigbeeAqaraMagnetContact_1.ZigbeeAqaraMagnetContact(zigbeeInfo);
                 break;
+            case 'AqaraOpple3Switch':
+                d = new zigbeeAqaraOpple3Switch_1.ZigbeeAqaraOpple3Switch(zigbeeInfo);
+                break;
             case 'AquaraMotion':
                 d = new zigbeeAquaraMotion_1.ZigbeeAquaraMotion(zigbeeInfo);
                 break;

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

@@ -4,6 +4,7 @@ import { BaseGroup } from './base-group';
 import { ZigbeeMotionSensor } from '../zigbee/zigbeeMotionSensor';
 export declare class PraesenzGroup extends BaseGroup {
     private _lastMovement;
+    private _lastLeftTimeout;
     getMotionDetector(): Array<HmIpBewegung | ZigbeeMotionSensor>;
     getPresenceSensors(): HmIpPraezenz[];
     constructor(roomName: string, presenceDetectorIds: string[], motionSensorIds: string[]);
@@ -11,6 +12,11 @@ export declare class PraesenzGroup extends BaseGroup {
     presentAmount(): number;
     anyPresent(): boolean;
     lastLeftCB(val: boolean, cb: () => void): void;
+    /**
+     * In case of an existing delayed last left callback timeout, this removes it.
+     * @private
+     */
+    private resetLastLeftTimeout;
     addLastLeftCallback(cb: () => void): void;
     private firstEnterCallback;
     addFirstEnterCallback(cb: () => void): void;

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

@@ -14,6 +14,7 @@ class PraesenzGroup extends base_group_1.BaseGroup {
     constructor(roomName, presenceDetectorIds, motionSensorIds) {
         super(roomName, group_type_1.GroupType.Presence);
         this._lastMovement = new Date(0);
+        this._lastLeftTimeout = null;
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.PresenceDetection, new device_list_1.DeviceList(presenceDetectorIds));
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.MotionDetection, new device_list_1.DeviceList(motionSensorIds));
     }
@@ -94,10 +95,8 @@ class PraesenzGroup extends base_group_1.BaseGroup {
         return false;
     }
     lastLeftCB(val, cb) {
-        if (val) {
-            return;
-        }
-        if (this.anyPresent()) {
+        if (val || this.anyPresent()) {
+            this.resetLastLeftTimeout();
             return;
         }
         let timeAfterReset = utils_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().settings.movementResetTimer * 1000;
@@ -107,7 +106,8 @@ class PraesenzGroup extends base_group_1.BaseGroup {
             return;
         }
         this.log(logLevel_1.LogLevel.Debug, `Movement reset in ${this.roomName} delayed.`);
-        utils_1.Utils.guardedTimeout(() => {
+        this.resetLastLeftTimeout();
+        this._lastLeftTimeout = utils_1.Utils.guardedTimeout(() => {
             timeAfterReset =
                 utils_1.Utils.nowMS() - this._lastMovement.getTime() - this.getRoom().settings.movementResetTimer * 1000;
             this.log(logLevel_1.LogLevel.Debug, `Delayed Movement reset. Active Motions: ${this.presentAmount()}\tTime after Last Movement including Reset: ${timeAfterReset}`);
@@ -116,6 +116,15 @@ class PraesenzGroup extends base_group_1.BaseGroup {
             }
         }, Math.abs(timeAfterReset) + 500, this);
     }
+    /**
+     * In case of an existing delayed last left callback timeout, this removes it.
+     * @private
+     */
+    resetLastLeftTimeout() {
+        if (this._lastLeftTimeout !== null) {
+            clearTimeout(this._lastLeftTimeout);
+        }
+    }
     addLastLeftCallback(cb) {
         this.getPresenceSensors().forEach((p) => {
             p.addPresenceCallback((val) => {

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

@@ -1,7 +1,7 @@
-import { HmIpTaster } from '../hmIPDevices/hmIpTaster';
 import { BaseGroup } from './base-group';
+import { iButtonSwitch } from '../iButtonSwitch';
 export declare class TasterGroup extends BaseGroup {
-    getButtons(): HmIpTaster[];
+    getButtons(): iButtonSwitch[];
     constructor(roomName: string, buttonIds: string[]);
     initCallbacks(): void;
 }

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

@@ -5,6 +5,7 @@ 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");
+const button_1 = require("../button");
 class TasterGroup extends base_group_1.BaseGroup {
     getButtons() {
         return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.Buttons);
@@ -15,36 +16,37 @@ class TasterGroup extends base_group_1.BaseGroup {
     }
     initCallbacks() {
         this.getButtons().forEach((t) => {
-            t.tasten.ObenLinks.addLongCallback((pValue) => {
+            var _a, _b, _c, _d, _e, _f, _g;
+            (_a = t.buttonTopLeft) === null || _a === void 0 ? void 0 : _a.addCb(button_1.ButtonPressType.long, (pValue) => {
                 var _a;
                 pValue && ((_a = this.getRoom().FensterGroup) === null || _a === void 0 ? void 0 : _a.allRolloDown(false, true));
             }, `Close all Rollos in this room`);
-            t.tasten.ObenLinks.addShortCallback((pValue) => {
+            (_b = t.buttonTopLeft) === null || _b === void 0 ? void 0 : _b.addCb(button_1.ButtonPressType.short, (pValue) => {
                 var _a;
                 pValue && ((_a = this.getRoom().FensterGroup) === null || _a === void 0 ? void 0 : _a.allRolloToLevel(25, true));
             }, `Nearly closes all Rollos in this room`);
-            t.tasten.ObenRechts.addLongCallback((pValue) => {
+            (_c = t.buttonTopRight) === null || _c === void 0 ? void 0 : _c.addCb(button_1.ButtonPressType.long, (pValue) => {
                 var _a;
                 if (!pValue) {
                     return;
                 }
                 (_a = this.getRoom().FensterGroup) === null || _a === void 0 ? void 0 : _a.allRolloUp(true);
             }, `Open all Rollos in this room`);
-            t.tasten.ObenRechts.addShortCallback((pValue) => {
+            (_d = t.buttonTopRight) === null || _d === void 0 ? void 0 : _d.addCb(button_1.ButtonPressType.short, (pValue) => {
                 var _a;
                 pValue && ((_a = this.getRoom().FensterGroup) === null || _a === void 0 ? void 0 : _a.allRolloToLevel(50, true));
             }, `All Rollos in this room to middle`);
-            t.tasten.MitteLinks.addLongCallback((pValue) => {
+            (_e = t.buttonMidLeft) === null || _e === void 0 ? void 0 : _e.addCb(button_1.ButtonPressType.long, (pValue) => {
                 var _a;
                 pValue && ((_a = this.getRoom().LampenGroup) === null || _a === void 0 ? void 0 : _a.switchAll(true, true));
             }, `Turn all Lights in this room on`);
-            t.tasten.MitteRechts.addLongCallback((pValue) => {
+            (_f = t.buttonMidRight) === null || _f === void 0 ? void 0 : _f.addCb(button_1.ButtonPressType.long, (pValue) => {
                 var _a;
                 pValue && ((_a = this.getRoom().LampenGroup) === null || _a === void 0 ? void 0 : _a.switchAll(false, true));
             }, `Turn all Lights in this room off`);
             const sonosGroup = this.getRoom().SonosGroup;
             if (sonosGroup !== undefined && sonosGroup.getOwnSonosDevices().length > 0) {
-                t.tasten.UntenRechts.addLongCallback(() => {
+                (_g = t.buttonBotRight) === null || _g === void 0 ? void 0 : _g.addCb(button_1.ButtonPressType.long, () => {
                     sonosGroup.trigger(this.getRoom().settings.radioUrl);
                 });
             }

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

@@ -1,13 +1,19 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
-import { iTaster } from '../iTaster';
+import { iButtonSwitch } from '../iButtonSwitch';
 import { DeviceInfo } from '../DeviceInfo';
-import { Taste } from '../taste';
-export declare class HmIpTaster extends HmIPDevice implements iTaster {
-    tasten: {
-        [id: string]: Taste;
-    };
+import { Button } from '../button';
+export declare class HmIpTaster extends HmIPDevice implements iButtonSwitch {
+    private static readonly BUTTON_CAPABILLITIES;
+    buttonTopLeft: Button;
+    buttonMidLeft: Button;
+    buttonBotLeft: Button;
+    buttonTopRight: Button;
+    buttonMidRight: Button;
+    buttonBotRight: Button;
+    buttonBot: undefined;
+    buttonTop: undefined;
     constructor(pInfo: DeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
-    getTastenAssignment(): string;
+    getButtonAssignment(): string;
 }

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

@@ -3,19 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpTaster = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
-const taste_1 = require("../taste");
+const button_1 = require("../button");
 const logLevel_1 = require("../../../models/logLevel");
 class HmIpTaster extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpTaster);
-        this.tasten = {
-            ObenLinks: new taste_1.Taste(1),
-            ObenRechts: new taste_1.Taste(2),
-            MitteLinks: new taste_1.Taste(3),
-            MitteRechts: new taste_1.Taste(4),
-            UntenLinks: new taste_1.Taste(5),
-            UntenRechts: new taste_1.Taste(6),
-        };
+        this.buttonTopLeft = new button_1.Button('TopLeft', HmIpTaster.BUTTON_CAPABILLITIES);
+        this.buttonMidLeft = new button_1.Button('MidLeft', HmIpTaster.BUTTON_CAPABILLITIES);
+        this.buttonBotLeft = new button_1.Button('BotLeft', HmIpTaster.BUTTON_CAPABILLITIES);
+        this.buttonTopRight = new button_1.Button('TopRight', HmIpTaster.BUTTON_CAPABILLITIES);
+        this.buttonMidRight = new button_1.Button('MidRight', HmIpTaster.BUTTON_CAPABILLITIES);
+        this.buttonBotRight = new button_1.Button('BotRight', HmIpTaster.BUTTON_CAPABILLITIES);
+        this.buttonBot = undefined;
+        this.buttonTop = undefined;
     }
     update(idSplit, state, initial = false) {
         this.log(logLevel_1.LogLevel.DeepTrace, `Taster Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
@@ -23,22 +23,22 @@ class HmIpTaster extends hmIpDevice_1.HmIPDevice {
         let cTaste = undefined;
         switch (idSplit[3]) {
             case '1':
-                cTaste = this.tasten.ObenLinks;
+                cTaste = this.buttonTopLeft;
                 break;
             case '2':
-                cTaste = this.tasten.ObenRechts;
+                cTaste = this.buttonTopRight;
                 break;
             case '3':
-                cTaste = this.tasten.MitteLinks;
+                cTaste = this.buttonMidLeft;
                 break;
             case '4':
-                cTaste = this.tasten.MitteRechts;
+                cTaste = this.buttonMidRight;
                 break;
             case '5':
-                cTaste = this.tasten.UntenLinks;
+                cTaste = this.buttonBotLeft;
                 break;
             case '6':
-                cTaste = this.tasten.UntenRechts;
+                cTaste = this.buttonBotRight;
                 break;
         }
         if (cTaste === undefined) {
@@ -48,25 +48,32 @@ class HmIpTaster extends hmIpDevice_1.HmIPDevice {
             case 'PRESS_SHORT':
                 if (!initial) {
                     // Tasten beim Starten ignorieren
-                    cTaste.updateShort(state.val);
+                    cTaste.updateState(button_1.ButtonPressType.short, state.val);
                 }
                 break;
             case 'PRESS_LONG':
                 if (!initial) {
                     // Tasten beim Starten ignorieren
-                    cTaste.updateLong(state.val);
+                    cTaste.updateState(button_1.ButtonPressType.long, state.val);
                 }
                 break;
         }
     }
-    getTastenAssignment() {
+    getButtonAssignment() {
         const result = [`Button: ${this.info.customName}`];
-        for (const tastenName in this.tasten) {
-            const desc = this.tasten[tastenName].getDescription();
+        for (const taste of [
+            this.buttonTopLeft,
+            this.buttonTopRight,
+            this.buttonMidLeft,
+            this.buttonMidRight,
+            this.buttonBotLeft,
+            this.buttonBotRight,
+        ]) {
+            const desc = taste.getDescription();
             if (desc === '') {
                 continue;
             }
-            result.push(`Button "${tastenName}":`);
+            result.push(`Button "${taste.name}":`);
             result.push(desc);
             result.push('');
         }
@@ -75,3 +82,9 @@ class HmIpTaster extends hmIpDevice_1.HmIPDevice {
     }
 }
 exports.HmIpTaster = HmIpTaster;
+HmIpTaster.BUTTON_CAPABILLITIES = {
+    shortPress: true,
+    longPress: true,
+    doublePress: false,
+    triplePress: false,
+};

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

@@ -1,12 +1,19 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
 import { DeviceInfo } from '../DeviceInfo';
-import { Taste } from '../taste';
-export declare class HmIpWippe extends HmIPDevice {
-    tasten: {
-        Unten: Taste;
-        Oben: Taste;
-    };
+import { Button } from '../button';
+import { iButtonSwitch } from '../iButtonSwitch';
+export declare class HmIpWippe extends HmIPDevice implements iButtonSwitch {
+    private static readonly BUTTON_CAPABILLITIES;
+    buttonTopLeft: undefined;
+    buttonMidLeft: undefined;
+    buttonBotLeft: undefined;
+    buttonTopRight: undefined;
+    buttonMidRight: undefined;
+    buttonBotRight: undefined;
+    buttonBot: Button;
+    buttonTop: Button;
     constructor(pInfo: DeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
+    getButtonAssignment(): string;
 }

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

@@ -3,15 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpWippe = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
-const taste_1 = require("../taste");
+const button_1 = require("../button");
 const logLevel_1 = require("../../../models/logLevel");
 class HmIpWippe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpWippe);
-        this.tasten = {
-            Unten: new taste_1.Taste(1),
-            Oben: new taste_1.Taste(2),
-        };
+        this.buttonBot = new button_1.Button('Bottom', HmIpWippe.BUTTON_CAPABILLITIES);
+        this.buttonTop = new button_1.Button('Top', HmIpWippe.BUTTON_CAPABILLITIES);
     }
     update(idSplit, state, initial = false) {
         this.log(logLevel_1.LogLevel.DeepTrace, `Wippe Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
@@ -19,10 +17,10 @@ class HmIpWippe extends hmIpDevice_1.HmIPDevice {
         let cTaste = undefined;
         switch (idSplit[3]) {
             case '1':
-                cTaste = this.tasten.Unten;
+                cTaste = this.buttonBot;
                 break;
             case '2':
-                cTaste = this.tasten.Oben;
+                cTaste = this.buttonTop;
                 break;
         }
         if (cTaste === undefined) {
@@ -33,17 +31,37 @@ class HmIpWippe extends hmIpDevice_1.HmIPDevice {
                 if (!initial) {
                     // Tasten beim Starten ignorieren
                     this.log(logLevel_1.LogLevel.Debug, `Tasten Update initial ignoriert`);
-                    cTaste.updateShort(state.val);
+                    cTaste.updateState(button_1.ButtonPressType.short, state.val);
                 }
                 break;
             case 'PRESS_LONG':
                 if (!initial) {
                     // Tasten beim Starten ignorieren
                     this.log(logLevel_1.LogLevel.Debug, `Tasten Update initial ignoriert`);
-                    cTaste.updateLong(state.val);
+                    cTaste.updateState(button_1.ButtonPressType.long, state.val);
                 }
                 break;
         }
     }
+    getButtonAssignment() {
+        const result = [`Button: ${this.info.customName}`];
+        for (const taste of [this.buttonTop, this.buttonBot]) {
+            const desc = taste.getDescription();
+            if (desc === '') {
+                continue;
+            }
+            result.push(`Button "${taste.name}":`);
+            result.push(desc);
+            result.push('');
+        }
+        result.push('____________');
+        return result.join('\n');
+    }
 }
 exports.HmIpWippe = HmIpWippe;
+HmIpWippe.BUTTON_CAPABILLITIES = {
+    shortPress: true,
+    longPress: true,
+    doublePress: false,
+    triplePress: false,
+};

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

@@ -0,0 +1,13 @@
+import { Button } from './button';
+import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
+export interface iButtonSwitch extends IoBrokerBaseDevice {
+    buttonTopLeft: Button | undefined;
+    buttonTopRight: Button | undefined;
+    buttonMidLeft: Button | undefined;
+    buttonMidRight: Button | undefined;
+    buttonBotLeft: Button | undefined;
+    buttonBotRight: Button | undefined;
+    buttonBot: Button | undefined;
+    buttonTop: Button | undefined;
+    getButtonAssignment(): string;
+}

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

@@ -2,6 +2,7 @@ export * from './groups/index';
 export * from './hmIPDevices/index';
 export * from './models/index';
 export * from './zigbee/index';
+export * from './button';
 export * from './device-cluster';
 export * from './device-cluster-type';
 export * from './device-list';
@@ -11,6 +12,7 @@ export * from './deviceType';
 export * from './deviceUpdater';
 export * from './Griffe';
 export * from './Heizgruppen';
+export * from './iButtonSwitch';
 export * from './iDeviceUpdater';
 export * from './iHumiditySensor';
 export * from './iIlluminationSensor';
@@ -18,7 +20,5 @@ export * from './iHeater';
 export * from './iLamp';
 export * from './IoBrokerBaseDevice';
 export * from './iShutter';
-export * from './iTaster';
 export * from './iTemperaturSensor';
-export * from './taste';
 export * from './wledDevice';

package/lib/server/devices/index.js

@@ -14,6 +14,7 @@ __exportStar(require("./groups/index"), exports);
 __exportStar(require("./hmIPDevices/index"), exports);
 __exportStar(require("./models/index"), exports);
 __exportStar(require("./zigbee/index"), exports);
+__exportStar(require("./button"), exports);
 __exportStar(require("./device-cluster"), exports);
 __exportStar(require("./device-cluster-type"), exports);
 __exportStar(require("./device-list"), exports);
@@ -23,6 +24,7 @@ __exportStar(require("./deviceType"), exports);
 __exportStar(require("./deviceUpdater"), exports);
 __exportStar(require("./Griffe"), exports);
 __exportStar(require("./Heizgruppen"), exports);
+__exportStar(require("./iButtonSwitch"), exports);
 __exportStar(require("./iDeviceUpdater"), exports);
 __exportStar(require("./iHumiditySensor"), exports);
 __exportStar(require("./iIlluminationSensor"), exports);
@@ -30,7 +32,5 @@ __exportStar(require("./iHeater"), exports);
 __exportStar(require("./iLamp"), exports);
 __exportStar(require("./IoBrokerBaseDevice"), exports);
 __exportStar(require("./iShutter"), exports);
-__exportStar(require("./iTaster"), exports);
 __exportStar(require("./iTemperaturSensor"), exports);
-__exportStar(require("./taste"), exports);
 __exportStar(require("./wledDevice"), exports);

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

@@ -1,5 +1,6 @@
 export * from './ZigbeeActuator';
 export * from './zigbeeAqaraMagnetContact';
+export * from './zigbeeAqaraOpple3Switch';
 export * from './zigbeeAquaraMotion';
 export * from './zigbeeAquaraVibra';
 export * from './zigbeeAquaraWater';
@@ -18,3 +19,4 @@ export * from './zigbeeShutter';
 export * from './zigbeeSMaBiTMagnetContact';
 export * from './zigbeeSonoffMotion';
 export * from './zigbeeSonoffTemp';
+export * from './zigbeeSwitch';

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

@@ -12,6 +12,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./ZigbeeActuator"), exports);
 __exportStar(require("./zigbeeAqaraMagnetContact"), exports);
+__exportStar(require("./zigbeeAqaraOpple3Switch"), exports);
 __exportStar(require("./zigbeeAquaraMotion"), exports);
 __exportStar(require("./zigbeeAquaraVibra"), exports);
 __exportStar(require("./zigbeeAquaraWater"), exports);
@@ -30,3 +31,4 @@ __exportStar(require("./zigbeeShutter"), exports);
 __exportStar(require("./zigbeeSMaBiTMagnetContact"), exports);
 __exportStar(require("./zigbeeSonoffMotion"), exports);
 __exportStar(require("./zigbeeSonoffTemp"), exports);
+__exportStar(require("./zigbeeSwitch"), exports);

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

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