hoffmation-base 0.1.33 → 0.1.35

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

@@ -8,11 +8,13 @@ export interface iRestSettings {
     port?: number;
 }
 export interface iConfig {
+    cacheDir?: string;
     ioBrokerUrl: string;
     logSettings?: iLogSettings;
     translationSettings: iTranslationSettings;
     mp3Server?: iMp3Settings;
     muell?: iMuellSettings;
+    news?: iNewsSettings;
     persistence?: iPersistenceSettings;
     polly?: iPollySettings;
     restServer?: iRestSettings;
@@ -64,6 +66,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/device-cluster-type.d.ts

@@ -1,17 +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
+    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,19 +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["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

@@ -27,5 +27,6 @@ export declare enum DeviceType {
     ZigbeeSMaBiTMagnetContact = 213,
     ZigbeeSonoffMotion = 214,
     ZigbeeAqaraMagnetContact = 215,
+    ZigbeeSonoffTemp = 216,
     Wled = 1001
 }

package/lib/server/devices/deviceType.js

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

package/lib/server/devices/devices.js

@@ -33,6 +33,7 @@ const zigbeeSMaBiTMagnetContact_1 = require("./zigbee/zigbeeSMaBiTMagnetContact"
 const zigbeeSonoffMotion_1 = require("./zigbee/zigbeeSonoffMotion");
 const hmIpAccessPoint_1 = require("./hmIPDevices/hmIpAccessPoint");
 const zigbeeAqaraMagnetContact_1 = require("./zigbee/zigbeeAqaraMagnetContact");
+const zigbeeSonoffTemp_1 = require("./zigbee/zigbeeSonoffTemp");
 class Devices {
     constructor(pDeviceData, pRoomImportEnforcer) {
         // This forces import of rooms at correct timing, to allow devices to land in proper rooms.
@@ -131,6 +132,9 @@ class Devices {
             case 'SonoffMotion':
                 d = new zigbeeSonoffMotion_1.ZigbeeSonoffMotion(zigbeeInfo);
                 break;
+            case 'SonoffTemp':
+                d = new zigbeeSonoffTemp_1.ZigbeeSonoffTemp(zigbeeInfo);
+                break;
             default:
                 log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Warn, `No zigbee Device Type for ${zigbeeInfo.deviceType} defined`);
                 d = new zigbeeDevice_1.ZigbeeDevice(zigbeeInfo, deviceType_1.DeviceType.unknown);

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

@@ -1,8 +1,12 @@
 import { HmIpHeizgruppe } from '../hmIPDevices/hmIpHeizgruppe';
 import { BaseGroup } from './base-group';
+import { iTemperaturSensor } from '../iTemperaturSensor';
+import { iHumiditySensor } from '../iHumiditySensor';
 export declare class HeatGroup extends BaseGroup {
     get currentTemp(): number;
     get desiredTemp(): number;
     getHeater(): HmIpHeizgruppe[];
-    constructor(roomName: string, heaterIds: string[]);
+    getTempSensors(): iTemperaturSensor[];
+    getHumiditySensors(): iHumiditySensor[];
+    constructor(roomName: string, heaterIds: string[], tempSensorIds: string[], humiditySensorIds: string[]);
 }

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

@@ -11,10 +11,11 @@ class HeatGroup extends base_group_1.BaseGroup {
             return -99;
         }
         let value = 0;
-        for (const h of this.getHeater()) {
+        const sensors = this.getTempSensors();
+        for (const h of sensors) {
             value += h.iTemperatur;
         }
-        return Math.round((value / this.getHeater().length) * 10) / 10;
+        return Math.round((value / sensors.length) * 10) / 10;
     }
     get desiredTemp() {
         if (this.getHeater().length === 0) {
@@ -29,9 +30,17 @@ class HeatGroup extends base_group_1.BaseGroup {
     getHeater() {
         return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.Heater);
     }
-    constructor(roomName, heaterIds) {
+    getTempSensors() {
+        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.TemperaturSensor);
+    }
+    getHumiditySensors() {
+        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.HumiditySensor);
+    }
+    constructor(roomName, heaterIds, tempSensorIds, humiditySensorIds) {
         super(roomName, group_type_1.GroupType.Heating);
         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));
     }
 }
 exports.HeatGroup = HeatGroup;

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

@@ -2,8 +2,10 @@
 import { HmIPDevice } from './hmIpDevice';
 import { DeviceInfo } from '../DeviceInfo';
 import { TemperaturSettings } from '../../../models/temperaturSettings';
-import { HmIpHeizung } from './hmIpHeizung';
-export declare class HmIpHeizgruppe extends HmIPDevice {
+import { iTemperaturSensor } from '../iTemperaturSensor';
+import { iHumiditySensor } from '../iHumiditySensor';
+import { iHeater } from '../iHeater';
+export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperaturSensor, iHumiditySensor, iHeater {
     private _automaticMode;
     private _iAutomaticInterval;
     private _level;
@@ -25,10 +27,10 @@ export declare class HmIpHeizgruppe extends HmIPDevice {
     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";

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

@@ -0,0 +1,11 @@
+import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
+import { TemperaturSettings } from '../../models/temperaturSettings';
+export interface iHeater extends IoBrokerBaseDevice {
+    readonly desiredTemperatur: number;
+    readonly iLevel: number;
+    readonly iTemperatur: number;
+    deleteAutomaticPoint(name: string): void;
+    setAutomaticPoint(name: string, setting: TemperaturSettings): void;
+    stopAutomaticCheck(): void;
+    checkAutomaticChange(): void;
+}

package/lib/server/devices/iHeater.js

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

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

@@ -0,0 +1,5 @@
+import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
+export interface iHumiditySensor extends IoBrokerBaseDevice {
+    humidity: number;
+    addHumidityCallback(pCallback: (pValue: number) => void): void;
+}

package/lib/server/devices/iHumiditySensor.js

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

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

@@ -0,0 +1,5 @@
+import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
+export interface iTemperaturSensor extends IoBrokerBaseDevice {
+    iTemperatur: number;
+    sTemperatur: string;
+}

package/lib/server/devices/iTemperaturSensor.js

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

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

@@ -12,10 +12,13 @@ export * from './deviceUpdater';
 export * from './Griffe';
 export * from './Heizgruppen';
 export * from './iDeviceUpdater';
+export * from './iHumiditySensor';
 export * from './iIlluminationSensor';
+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

@@ -24,10 +24,13 @@ __exportStar(require("./deviceUpdater"), exports);
 __exportStar(require("./Griffe"), exports);
 __exportStar(require("./Heizgruppen"), exports);
 __exportStar(require("./iDeviceUpdater"), exports);
+__exportStar(require("./iHumiditySensor"), exports);
 __exportStar(require("./iIlluminationSensor"), exports);
+__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

@@ -17,3 +17,4 @@ export * from './zigbeeMotionSensor';
 export * from './zigbeeShutter';
 export * from './zigbeeSMaBiTMagnetContact';
 export * from './zigbeeSonoffMotion';
+export * from './zigbeeSonoffTemp';

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

@@ -29,3 +29,4 @@ __exportStar(require("./zigbeeMotionSensor"), exports);
 __exportStar(require("./zigbeeShutter"), exports);
 __exportStar(require("./zigbeeSMaBiTMagnetContact"), exports);
 __exportStar(require("./zigbeeSonoffMotion"), exports);
+__exportStar(require("./zigbeeSonoffTemp"), exports);

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

@@ -32,12 +32,12 @@ class ZigbeeBlitzShp extends zigbeeDevice_1.ZigbeeDevice {
                 break;
             case 'current':
                 const newCurrent = state.val;
-                this.log(newCurrent !== this.current ? logLevel_1.LogLevel.Trace : logLevel_1.LogLevel.DeepTrace, `Outlet update, new current: ${state.val}`);
+                this.log(Math.abs(newCurrent - this.current) > 0.25 ? logLevel_1.LogLevel.Trace : logLevel_1.LogLevel.DeepTrace, `Outlet update, new current: ${state.val}`);
                 this.current = newCurrent;
                 break;
             case 'load_power':
                 const newLoadPower = state.val;
-                this.log(newLoadPower !== this.loadPower ? logLevel_1.LogLevel.Trace : logLevel_1.LogLevel.DeepTrace, `Outlet update, new current load power: ${state.val}`);
+                this.log(Math.abs(newLoadPower - this.loadPower) > 0.25 ? logLevel_1.LogLevel.Trace : logLevel_1.LogLevel.DeepTrace, `Outlet update, new current load power: ${state.val}`);
                 this.loadPower = newLoadPower;
                 break;
         }

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

@@ -5,6 +5,8 @@ import { ZigbeeDevice } from './zigbeeDevice';
 import { MagnetPosition } from '../models/MagnetPosition';
 export declare class ZigbeeMagnetContact extends ZigbeeDevice {
     position: MagnetPosition;
+    telegramOnOpen: boolean;
+    speakOnOpen: boolean;
     private _closedCallback;
     private _openCallback;
     private _iOpenTimeout;