hoffmation-base 0.1.34-2 → 0.1.37-1

package/lib/index.js

@@ -65,7 +65,10 @@ class HoffmationBase {
                 server_1.MuellService.intialize(server_1.SettingsService.settings.muell, defaultMuellSonos);
             }
         });
-        server_1.Utils.guardedNewThread(server_1.NewsService.initialize);
+        server_1.Utils.guardedNewThread(() => {
+            server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `News settings detected --> initializing`);
+            server_1.NewsService.initialize(server_1.SettingsService.settings.news);
+        });
         server_1.Utils.guardedNewThread(() => {
             if (server_1.SettingsService.settings.weather) {
                 server_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Weather settings detected --> initializing`);

package/lib/models/actuatorSettings.d.ts

@@ -1,4 +1,5 @@
-export declare class ActuatorSettings {
+import { DeviceSettings } from './deviceSettings';
+export declare class ActuatorSettings extends DeviceSettings {
     dawnOn: boolean;
     duskOn: boolean;
     nightOn: boolean;

package/lib/models/actuatorSettings.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActuatorSettings = void 0;
-class ActuatorSettings {
+const deviceSettings_1 = require("./deviceSettings");
+class ActuatorSettings extends deviceSettings_1.DeviceSettings {
     constructor() {
+        super(...arguments);
         this.dawnOn = true;
         this.duskOn = true;
         this.nightOn = true;

package/lib/models/deviceSettings.d.ts

@@ -0,0 +1,2 @@
+export declare class DeviceSettings {
+}

package/lib/models/deviceSettings.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeviceSettings = void 0;
+class DeviceSettings {
+}
+exports.DeviceSettings = DeviceSettings;

package/lib/models/ledSettings.d.ts

@@ -1,4 +1,5 @@
-export declare class LedSettings {
+import { DeviceSettings } from './deviceSettings';
+export declare class LedSettings extends DeviceSettings {
     defaultColor: string;
     dayOn: boolean;
     dayBrightness: number;

package/lib/models/ledSettings.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LedSettings = void 0;
-class LedSettings {
+const deviceSettings_1 = require("./deviceSettings");
+class LedSettings extends deviceSettings_1.DeviceSettings {
     constructor() {
+        super(...arguments);
         this.defaultColor = '#fbbc32';
         this.dayOn = false;
         this.dayBrightness = 100;

package/lib/models/logSource.d.ts

@@ -0,0 +1,4 @@
+export declare enum LogSource {
+    NotSpecified = 0,
+    News = 1
+}

package/lib/models/logSource.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LogSource = void 0;
+var LogSource;
+(function (LogSource) {
+    LogSource[LogSource["NotSpecified"] = 0] = "NotSpecified";
+    LogSource[LogSource["News"] = 1] = "News";
+})(LogSource = exports.LogSource || (exports.LogSource = {}));

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

@@ -12,10 +12,13 @@ import { iRoomBase } from './iRoomBase';
 import { RoomInfo } from './roomInfo';
 import { BaseGroup } from '../../server/devices/groups/base-group';
 import { GroupType } from '../../server/devices/groups/group-type';
+import { DeviceCluster } from '../../server/devices/device-cluster';
 export declare class RoomBase implements iRoomBase {
     settings: RoomSettings;
     groups: Map<GroupType, BaseGroup>;
     info: RoomInfo;
+    protected _deviceCluster: DeviceCluster;
+    get deviceCluster(): DeviceCluster;
     get FensterGroup(): FensterGroup | undefined;
     get PraesenzGroup(): PraesenzGroup | undefined;
     get LampenGroup(): LampenGroup | undefined;

package/lib/models/rooms/RoomBase.js

@@ -14,16 +14,21 @@ const group_type_1 = require("../../server/devices/groups/group-type");
 const ShutterService_1 = require("../../server/services/ShutterService");
 const utils_1 = require("../../server/services/utils/utils");
 const lodash_1 = __importDefault(require("lodash"));
+const device_cluster_1 = require("../../server/devices/device-cluster");
 class RoomBase {
     constructor(roomName, settings, groups) {
         this.settings = settings;
         this.groups = groups;
+        this._deviceCluster = new device_cluster_1.DeviceCluster();
         this.skipNextRolloUp = false;
         this.info = new roomInfo_1.RoomInfo(roomName, settings);
         settings.roomName = roomName;
         this.settings = settings;
         room_service_1.RoomService.addToRoomList(this);
     }
+    get deviceCluster() {
+        return this._deviceCluster;
+    }
     get FensterGroup() {
         return this.groups.get(group_type_1.GroupType.Window);
     }
@@ -133,7 +138,7 @@ class RoomBase {
     toJSON() {
         const result = utils_1.Utils.jsonFilter(this);
         result.groupDict = Object.fromEntries(this.groups);
-        return lodash_1.default.omit(result, 'groups');
+        return lodash_1.default.omit(result, ['groups', '_deviceCluster']);
     }
     log(level, message) {
         log_service_1.ServerLogService.writeLog(level, message, {

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

@@ -13,6 +13,7 @@ export interface iConfig {
     translationSettings: iTranslationSettings;
     mp3Server?: iMp3Settings;
     muell?: iMuellSettings;
+    news?: iNewsSettings;
     persistence?: iPersistenceSettings;
     polly?: iPollySettings;
     restServer?: iRestSettings;
@@ -64,6 +65,11 @@ export interface iWeatherSettings {
 export interface iMuellSettings {
     calendarURL: string;
 }
+export interface iNewsSettings {
+    rssUrl?: string;
+    requestInterval?: number;
+    keepMaxAge?: number;
+}
 export interface iTranslationSettings {
     language: string;
 }

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/device-cluster-type.d.ts

@@ -1,19 +1,20 @@
 export declare enum DeviceClusterType {
-    Buttons = 0,
-    Heater = 1,
-    LED = 2,
-    Lamps = 3,
-    MotionDetection = 4,
-    Outlets = 5,
-    PresenceDetection = 6,
-    Speaker = 7,
-    SmokeDetector = 8,
-    WaterDetectors = 9,
-    Windows = 10,
-    Handle = 11,
-    Vibration = 12,
-    Shutter = 13,
-    MagnetContact = 14,
-    TemperaturSensor = 15,
-    HumiditySensor = 16
+    all = 0,
+    Buttons = 1,
+    Heater = 2,
+    LED = 3,
+    Lamps = 4,
+    MotionDetection = 5,
+    Outlets = 6,
+    PresenceDetection = 7,
+    Speaker = 8,
+    SmokeDetector = 9,
+    WaterDetectors = 10,
+    Windows = 11,
+    Handle = 12,
+    Vibration = 13,
+    Shutter = 14,
+    MagnetContact = 15,
+    TemperaturSensor = 16,
+    HumiditySensor = 17
 }

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

@@ -3,21 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceClusterType = void 0;
 var DeviceClusterType;
 (function (DeviceClusterType) {
-    DeviceClusterType[DeviceClusterType["Buttons"] = 0] = "Buttons";
-    DeviceClusterType[DeviceClusterType["Heater"] = 1] = "Heater";
-    DeviceClusterType[DeviceClusterType["LED"] = 2] = "LED";
-    DeviceClusterType[DeviceClusterType["Lamps"] = 3] = "Lamps";
-    DeviceClusterType[DeviceClusterType["MotionDetection"] = 4] = "MotionDetection";
-    DeviceClusterType[DeviceClusterType["Outlets"] = 5] = "Outlets";
-    DeviceClusterType[DeviceClusterType["PresenceDetection"] = 6] = "PresenceDetection";
-    DeviceClusterType[DeviceClusterType["Speaker"] = 7] = "Speaker";
-    DeviceClusterType[DeviceClusterType["SmokeDetector"] = 8] = "SmokeDetector";
-    DeviceClusterType[DeviceClusterType["WaterDetectors"] = 9] = "WaterDetectors";
-    DeviceClusterType[DeviceClusterType["Windows"] = 10] = "Windows";
-    DeviceClusterType[DeviceClusterType["Handle"] = 11] = "Handle";
-    DeviceClusterType[DeviceClusterType["Vibration"] = 12] = "Vibration";
-    DeviceClusterType[DeviceClusterType["Shutter"] = 13] = "Shutter";
-    DeviceClusterType[DeviceClusterType["MagnetContact"] = 14] = "MagnetContact";
-    DeviceClusterType[DeviceClusterType["TemperaturSensor"] = 15] = "TemperaturSensor";
-    DeviceClusterType[DeviceClusterType["HumiditySensor"] = 16] = "HumiditySensor";
+    DeviceClusterType[DeviceClusterType["all"] = 0] = "all";
+    DeviceClusterType[DeviceClusterType["Buttons"] = 1] = "Buttons";
+    DeviceClusterType[DeviceClusterType["Heater"] = 2] = "Heater";
+    DeviceClusterType[DeviceClusterType["LED"] = 3] = "LED";
+    DeviceClusterType[DeviceClusterType["Lamps"] = 4] = "Lamps";
+    DeviceClusterType[DeviceClusterType["MotionDetection"] = 5] = "MotionDetection";
+    DeviceClusterType[DeviceClusterType["Outlets"] = 6] = "Outlets";
+    DeviceClusterType[DeviceClusterType["PresenceDetection"] = 7] = "PresenceDetection";
+    DeviceClusterType[DeviceClusterType["Speaker"] = 8] = "Speaker";
+    DeviceClusterType[DeviceClusterType["SmokeDetector"] = 9] = "SmokeDetector";
+    DeviceClusterType[DeviceClusterType["WaterDetectors"] = 10] = "WaterDetectors";
+    DeviceClusterType[DeviceClusterType["Windows"] = 11] = "Windows";
+    DeviceClusterType[DeviceClusterType["Handle"] = 12] = "Handle";
+    DeviceClusterType[DeviceClusterType["Vibration"] = 13] = "Vibration";
+    DeviceClusterType[DeviceClusterType["Shutter"] = 14] = "Shutter";
+    DeviceClusterType[DeviceClusterType["MagnetContact"] = 15] = "MagnetContact";
+    DeviceClusterType[DeviceClusterType["TemperaturSensor"] = 16] = "TemperaturSensor";
+    DeviceClusterType[DeviceClusterType["HumiditySensor"] = 17] = "HumiditySensor";
 })(DeviceClusterType = exports.DeviceClusterType || (exports.DeviceClusterType = {}));

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

@@ -7,6 +7,8 @@ export declare class DeviceCluster {
     constructor(deviceMap?: Map<DeviceClusterType, DeviceList>);
     getIoBrokerDevicesByType(type: DeviceClusterType): IoBrokerBaseDevice[];
     getDevicesByType(type: DeviceClusterType): Array<IoBrokerBaseDevice | OwnSonosDevice>;
+    addByDeviceType(device: IoBrokerBaseDevice): void;
+    addToList(type: DeviceClusterType, device: IoBrokerBaseDevice): void;
     toJSON(): Partial<DeviceCluster & {
         deviceDict?: {
             [p: string]: DeviceList;

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

@@ -5,8 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceCluster = void 0;
 const device_cluster_type_1 = require("./device-cluster-type");
+const device_list_1 = require("./device-list");
 const utils_1 = require("../services/utils/utils");
 const lodash_1 = __importDefault(require("lodash"));
+const deviceType_1 = require("./deviceType");
 class DeviceCluster {
     constructor(deviceMap = new Map()) {
         this.deviceMap = deviceMap;
@@ -21,6 +23,91 @@ class DeviceCluster {
         var _a, _b;
         return (_b = (_a = this.deviceMap.get(type)) === null || _a === void 0 ? void 0 : _a.getDevices()) !== null && _b !== void 0 ? _b : [];
     }
+    addByDeviceType(device) {
+        const type = device.deviceType;
+        const clusterTypes = [device_cluster_type_1.DeviceClusterType.all];
+        switch (type) {
+            case deviceType_1.DeviceType.HmIpLampe:
+            case deviceType_1.DeviceType.ZigbeeIlluDimmer:
+            case deviceType_1.DeviceType.ZigbeeIlluLampe:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Lamps);
+                break;
+            case deviceType_1.DeviceType.HmIpWippe:
+            case deviceType_1.DeviceType.HmIpTaster:
+            case deviceType_1.DeviceType.ZigbeeIkeaFernbedienung:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Buttons);
+                break;
+            case deviceType_1.DeviceType.HmIpRoll:
+            case deviceType_1.DeviceType.ZigbeeIlluShutter:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Shutter);
+                break;
+            case deviceType_1.DeviceType.ZigbeeSonoffTemp:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.TemperaturSensor);
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.HumiditySensor);
+                break;
+            case deviceType_1.DeviceType.HmIpPraezenz:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.PresenceDetection);
+                break;
+            case deviceType_1.DeviceType.HmIpGriff:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Handle);
+                break;
+            case deviceType_1.DeviceType.HmIpHeizgruppe:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Heater);
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.TemperaturSensor);
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.HumiditySensor);
+                break;
+            case deviceType_1.DeviceType.HmIpTuer:
+            case deviceType_1.DeviceType.ZigbeeSMaBiTMagnetContact:
+            case deviceType_1.DeviceType.ZigbeeAqaraMagnetContact:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.MagnetContact);
+                break;
+            case deviceType_1.DeviceType.HmIpBewegung:
+            case deviceType_1.DeviceType.ZigbeeAquaraMotion:
+            case deviceType_1.DeviceType.ZigbeeSonoffMotion:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.MotionDetection);
+                break;
+            case deviceType_1.DeviceType.ZigbeeIkeaSteckdose:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Outlets);
+                break;
+            case deviceType_1.DeviceType.ZigbeeIlluLedRGBCCT:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.LED);
+                break;
+            case deviceType_1.DeviceType.ZigbeeAquaraVibra:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Vibration);
+                break;
+            case deviceType_1.DeviceType.ZigbeeHeimanSmoke:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.SmokeDetector);
+                break;
+            case deviceType_1.DeviceType.ZigbeeAquaraWater:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.WaterDetectors);
+                break;
+            case deviceType_1.DeviceType.ZigbeeBlitzShp:
+                clusterTypes.push(device_cluster_type_1.DeviceClusterType.Outlets);
+                break;
+            case deviceType_1.DeviceType.ZigbeeIlluActuator: // Dependent on use case
+            case deviceType_1.DeviceType.HmIpTherm: // Humidity and temperatur not yet implemented
+            case deviceType_1.DeviceType.HmIpHeizung: // Setting/Controlling via HM-Ip Heizgruppe
+            case deviceType_1.DeviceType.unknown:
+            case deviceType_1.DeviceType.Wled: // TODO: Implement
+            case deviceType_1.DeviceType.HmIpAccessPoint: // You can't really do stuff with it.
+                break;
+        }
+        for (const type of clusterTypes) {
+            this.addToList(type, device);
+        }
+    }
+    addToList(type, device) {
+        var _a;
+        const list = (_a = this.deviceMap.get(type)) === null || _a === void 0 ? void 0 : _a.ids;
+        if (list !== undefined) {
+            if (list.indexOf(device.id) < 0) {
+                list.push(device.id);
+            }
+        }
+        else {
+            this.deviceMap.set(type, new device_list_1.DeviceList([device.id]));
+        }
+    }
     toJSON() {
         const result = utils_1.Utils.jsonFilter(this);
         result.deviceDict = Object.fromEntries(this.deviceMap);

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/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/hmIpHeizgruppe.d.ts

@@ -2,10 +2,10 @@
 import { HmIPDevice } from './hmIpDevice';
 import { DeviceInfo } from '../DeviceInfo';
 import { TemperaturSettings } from '../../../models/temperaturSettings';
-import { HmIpHeizung } from './hmIpHeizung';
 import { iTemperaturSensor } from '../iTemperaturSensor';
 import { iHumiditySensor } from '../iHumiditySensor';
-export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperaturSensor, iHumiditySensor {
+import { iHeater } from '../iHeater';
+export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperaturSensor, iHumiditySensor, iHeater {
     private _automaticMode;
     private _iAutomaticInterval;
     private _level;
@@ -27,10 +27,10 @@ export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperaturSen
     set desiredTemperatur(val: number);
     addHumidityCallback(pCallback: (pValue: number) => void): void;
     deleteAutomaticPoint(name: string): void;
-    getBelongingHeizungen(): HmIpHeizung[];
+    getBelongingHeizungen(): iHeater[];
     setAutomaticPoint(name: string, setting: TemperaturSettings): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     stopAutomaticCheck(): void;
     private updateBaseInformation;
-    private checkAutomaticChange;
+    checkAutomaticChange(): void;
 }

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

@@ -4,9 +4,9 @@ exports.HmIpHeizgruppe = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
 const utils_1 = require("../../services/utils/utils");
-const devices_1 = require("../devices");
 const persist_1 = require("../../services/dbo/persist");
 const logLevel_1 = require("../../../models/logLevel");
+const device_cluster_type_1 = require("../device-cluster-type");
 class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpHeizgruppe);
@@ -64,13 +64,10 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
             delete this._automaticPoints[name];
     }
     getBelongingHeizungen() {
-        const result = [];
-        for (const dID in devices_1.Devices.alLDevices) {
-            const d = devices_1.Devices.alLDevices[dID];
-            if (d.deviceType === deviceType_1.DeviceType.HmIpHeizung && d.info.room === this.info.room) {
-                result.push(d);
-            }
+        if (!this.room) {
+            return [];
         }
+        const result = this.room.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Heater);
         return result;
     }
     setAutomaticPoint(name, setting) {

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

@@ -1,6 +1,6 @@
 /// <reference types="iobroker" />
-import { HmIPDevice } from './hmIpDevice';
 import { DeviceInfo } from '../DeviceInfo';
+import { HmIPDevice } from './hmIpDevice';
 export declare class HmIpHeizung extends HmIPDevice {
     private _temperatur;
     private _level;

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpHeizung = void 0;
-const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
 const logLevel_1 = require("../../../models/logLevel");
+const hmIpDevice_1 = require("./hmIpDevice");
 var HmIpHeizungAdaptionStates;
 (function (HmIpHeizungAdaptionStates) {
     HmIpHeizungAdaptionStates[HmIpHeizungAdaptionStates["StateNotAvailable"] = 0] = "StateNotAvailable";