hoffmation-base 0.1.41-20 → 0.1.41-22

package/lib/index.js

@@ -15,8 +15,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HoffmationBase = exports.HoffmationInitializationObject = void 0;
-const models_1 = require("./models");
 const server_1 = require("./server");
+const models_1 = require("./models");
 __exportStar(require("./models/index"), exports);
 __exportStar(require("./server/index"), exports);
 class HoffmationInitializationObject {

package/lib/models/deviceSettings/heaterSettings.d.ts

@@ -3,4 +3,20 @@ export declare class HeaterSettings extends DeviceSettings {
     automaticMode: boolean;
     automaticFallBackTemperatur: number;
     useOwnTemperatur: boolean;
+    /**
+     * Whether this device should turn off at Start of summer season and only heat in winter
+     * @type {boolean}
+     */
+    seasonalTurnOffActive: boolean;
+    /**
+     *
+     * The day in a year after which SeasonalHeater should be turned off completly
+     * @type {number}
+     */
+    seasonTurnOffDay: number;
+    /**
+     * The day in a year after which SeasonalHeater should be turned to automatic
+     * @type {number}
+     */
+    seasonTurnOnDay: number;
 }

package/lib/models/deviceSettings/heaterSettings.js

@@ -8,6 +8,22 @@ class HeaterSettings extends deviceSettings_1.DeviceSettings {
         this.automaticMode = true;
         this.automaticFallBackTemperatur = 20;
         this.useOwnTemperatur = true;
+        /**
+         * Whether this device should turn off at Start of summer season and only heat in winter
+         * @type {boolean}
+         */
+        this.seasonalTurnOffActive = true;
+        /**
+         *
+         * The day in a year after which SeasonalHeater should be turned off completly
+         * @type {number}
+         */
+        this.seasonTurnOffDay = 99;
+        /**
+         * The day in a year after which SeasonalHeater should be turned to automatic
+         * @type {number}
+         */
+        this.seasonTurnOnDay = 267;
     }
 }
 exports.HeaterSettings = HeaterSettings;

package/lib/models/rooms/RoomBase.js

@@ -54,12 +54,13 @@ class RoomBase {
         return this.info.etage;
     }
     initializeBase() {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         this.log(logLevel_1.LogLevel.Debug, `RoomBase Init für ${this.roomName}`);
         this.recalcTimeCallbacks();
         (_a = this.PraesenzGroup) === null || _a === void 0 ? void 0 : _a.initCallbacks();
         (_b = this.FensterGroup) === null || _b === void 0 ? void 0 : _b.initialize();
         (_c = this.TasterGroup) === null || _c === void 0 ? void 0 : _c.initCallbacks();
+        (_d = this.HeatGroup) === null || _d === void 0 ? void 0 : _d.initialize();
     }
     persist() {
         var _a;

package/lib/models/rooms/RoomSettings/RoomInitializationSettings.d.ts

@@ -3,7 +3,7 @@ import { RoomDeviceAddingSettings } from './roomDeviceAddingSettings';
 export declare class RoomInitializationSettings implements iRoomInitializationSettings {
     shortName: string;
     etage: number;
-    constructor(shortName: string, etage?: number);
     deviceAddidngSettings?: RoomDeviceAddingSettings;
+    constructor(shortName: string, etage?: number);
     static registerRoomForDevices(roomInitializationSettings: RoomInitializationSettings): void;
 }

package/lib/models/rooms/RoomSettings/RoomInitializationSettings.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoomInitializationSettings = void 0;
-const IoBrokerBaseDevice_1 = require("../../../server/devices/IoBrokerBaseDevice");
+const server_1 = require("../../../server");
 class RoomInitializationSettings {
     constructor(shortName, etage = -1) {
         this.shortName = shortName;
@@ -9,7 +9,7 @@ class RoomInitializationSettings {
     }
     static registerRoomForDevices(roomInitializationSettings) {
         if (roomInitializationSettings.deviceAddidngSettings !== undefined) {
-            IoBrokerBaseDevice_1.IoBrokerBaseDevice.addRoom(roomInitializationSettings.shortName, roomInitializationSettings.deviceAddidngSettings);
+            server_1.IoBrokerBaseDevice.addRoom(roomInitializationSettings.shortName, roomInitializationSettings.deviceAddidngSettings);
         }
     }
 }

package/lib/models/rooms/RoomSettings/roomAddDeviceItem.d.ts

@@ -3,8 +3,8 @@ export declare class RoomAddDeviceItem {
     setID: (value: string) => RoomBase;
     index: number;
     customName: string;
+    constructor(setID: (value: string) => RoomBase, index: number, customName: string);
     private _added;
     get added(): boolean;
     set added(value: boolean);
-    constructor(setID: (value: string) => RoomBase, index: number, customName: string);
 }

package/lib/models/rooms/RoomSettings/roomAddDeviceItem.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoomAddDeviceItem = void 0;
-const log_service_1 = require("../../../server/services/log-service/log-service");
+const server_1 = require("../../../server");
 const logLevel_1 = require("../../logLevel");
 class RoomAddDeviceItem {
     constructor(setID, index, customName) {
@@ -15,7 +15,7 @@ class RoomAddDeviceItem {
     }
     set added(value) {
         if (this._added) {
-            log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Error, `${this.customName} Added twice`);
+            server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Error, `${this.customName} Added twice`);
         }
         this._added = value;
     }

package/lib/models/rooms/RoomSettings/roomDeviceAddingSettings.d.ts

@@ -1,5 +1,5 @@
+import { DeviceType } from '../../../server';
 import { RoomAddDeviceItem } from './roomAddDeviceItem';
-import { DeviceType } from '../../../server/devices/deviceType';
 import { RoomBase } from '../RoomBase';
 export declare class RoomDeviceAddingSettings {
     RoomName: string;

package/lib/models/rooms/RoomSettings/roomDeviceAddingSettings.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoomDeviceAddingSettings = void 0;
-const log_service_1 = require("../../../server/services/log-service/log-service");
+const server_1 = require("../../../server");
 const roomAddDeviceItem_1 = require("./roomAddDeviceItem");
 const logLevel_1 = require("../../logLevel");
-const deviceType_1 = require("../../../server/devices/deviceType");
 class RoomDeviceAddingSettings {
     constructor(RoomName) {
         this.RoomName = RoomName;
@@ -15,7 +14,7 @@ class RoomDeviceAddingSettings {
             this.devices[deviceType] = [];
         }
         if (customName === undefined) {
-            customName = `${this.RoomName} ${deviceType_1.DeviceType[deviceType]}`;
+            customName = `${this.RoomName} ${server_1.DeviceType[deviceType]}`;
         }
         this.devices[deviceType][index] = new roomAddDeviceItem_1.RoomAddDeviceItem(setID, index, customName);
     }
@@ -25,7 +24,7 @@ class RoomDeviceAddingSettings {
             for (const index in devs) {
                 const dev = devs[index];
                 if (!dev.added) {
-                    log_service_1.ServerLogService.writeLog(logLevel_1.LogLevel.Error, `${dev.customName} fehlt in der Device JSON`);
+                    server_1.ServerLogService.writeLog(logLevel_1.LogLevel.Error, `${dev.customName} fehlt in der Device JSON`);
                 }
             }
         }

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

@@ -1,4 +1,4 @@
-import { RoomSettings } from './RoomSettings/RoomSettings';
+import { RoomSettings } from './RoomSettings';
 export declare class RoomInfo {
     roomName: string;
     etage?: number;

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

@@ -1,5 +1,4 @@
-import { LogLevel } from '../../models/logLevel';
-import { iRoomDefaultSettings } from '../../models/rooms/RoomSettings/iRoomDefaultSettings';
+import { iRoomDefaultSettings, LogLevel } from '../../models';
 import { PoolConfig } from 'pg';
 interface iSonosSettings {
     active: boolean;

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

@@ -1,4 +1,4 @@
-import { deviceConfig } from '../../models/deviceConfig';
+import { deviceConfig } from '../../models';
 export declare class DeviceInfo {
     devID: string;
     room: string;
@@ -6,7 +6,6 @@ export declare class DeviceInfo {
     deviceRoomIndex: number;
     type: 'device' | 'channel' | 'state';
     fullName: string;
-    private _customName?;
     fullID: string;
     channel?: number;
     valueName?: string;
@@ -19,7 +18,8 @@ export declare class DeviceInfo {
      * so we name the first child state for the object creation (e.g. javascript.0.00-EnergyManager.CurrentProduction)
      */
     constructor(pDevConf: deviceConfig, isJsStateChildObject?: boolean);
-    set customName(val: string);
+    private _customName?;
     get customName(): string;
+    set customName(val: string);
     toJSON(): Partial<DeviceInfo>;
 }

package/lib/server/devices/DeviceInfo.js

@@ -61,15 +61,15 @@ class DeviceInfo {
             this.deviceRoomIndex = nameSplit.length >= 4 ? Number(nameSplit[3]) : 0;
         }
     }
-    set customName(val) {
-        this._customName = val;
-    }
     get customName() {
         if (this._customName !== undefined) {
             return this._customName;
         }
         return this.fullName;
     }
+    set customName(val) {
+        this._customName = val;
+    }
     toJSON() {
         return lodash_1.default.omit(this, ['devConf']);
     }

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

@@ -1,4 +1,4 @@
-import { HmIpGriff } from './hmIPDevices/hmIpGriff';
+import { HmIpGriff } from './hmIPDevices';
 export declare class Griffe {
     static getGriffPosition(): string;
     static getAllGriffe(): HmIpGriff[];

package/lib/server/devices/Griffe.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Griffe = void 0;
 const deviceType_1 = require("./deviceType");
-const FensterPosition_1 = require("./models/FensterPosition");
+const models_1 = require("./models");
 const devices_1 = require("./devices");
 class Griffe {
     static getGriffPosition() {
@@ -13,7 +13,7 @@ class Griffe {
         });
         const response = [`Dies sind die aktuellen Stellungen der FensterGriffe:`];
         for (const g of griffe) {
-            response.push(`${FensterPosition_1.FensterPosition[g.position]} Fenster: "${g.info.customName}"`);
+            response.push(`${models_1.FensterPosition[g.position]} Fenster: "${g.info.customName}"`);
         }
         return response.join('\n');
     }

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

@@ -1,5 +1,5 @@
 /// <reference types="iobroker" />
-import { IBaseDevice } from './iBaseDevice';
+import { IBaseDevice } from './baseDeviceInterfaces';
 import { DeviceInfo } from './DeviceInfo';
 import { LogLevel, RoomBase, RoomDeviceAddingSettings } from '../../models';
 import { IOBrokerConnection } from '../ioBroker';

package/lib/server/devices/{iBaseDevice.d.ts → baseDeviceInterfaces/iBaseDevice.d.ts}

@@ -1,6 +1,6 @@
-import { LogLevel, RoomBase } from '../../models';
-import { DeviceType } from './deviceType';
-import { DeviceInfo } from './DeviceInfo';
+import { LogLevel, RoomBase } from '../../../models';
+import { DeviceType } from '../deviceType';
+import { DeviceInfo } from '../DeviceInfo';
 export interface IBaseDevice {
     room: RoomBase | undefined;
     deviceType: DeviceType;

package/lib/server/devices/{iButtonSwitch.d.ts → baseDeviceInterfaces/iButtonSwitch.d.ts}

@@ -1,4 +1,4 @@
-import { Button } from './button';
+import { Button } from '../button';
 import { IBaseDevice } from './iBaseDevice';
 export interface iButtonSwitch extends IBaseDevice {
     buttonTopLeft: Button | undefined;

package/lib/server/devices/{iExcessEnergyConsumer.d.ts → baseDeviceInterfaces/iExcessEnergyConsumer.d.ts}

@@ -1,4 +1,4 @@
-import { ExcessEnergyConsumerSettings } from '../../models';
+import { ExcessEnergyConsumerSettings } from '../../../models';
 import { IBaseDevice } from './iBaseDevice';
 export interface iExcessEnergyConsumer extends IBaseDevice {
     energyConsumerSettings: ExcessEnergyConsumerSettings;

package/lib/server/devices/{iHeater.d.ts → baseDeviceInterfaces/iHeater.d.ts}

@@ -1,12 +1,15 @@
-import { TemperaturSettings } from '../../models';
+import { HeaterSettings, TemperaturSettings } from '../../../models';
 import { IBaseDevice } from './iBaseDevice';
 export interface iHeater extends IBaseDevice {
+    settings: HeaterSettings;
     readonly desiredTemperatur: number;
     readonly humidity: number;
     readonly iLevel: number;
     readonly iTemperatur: number;
+    set seasonTurnOff(value: boolean);
     deleteAutomaticPoint(name: string): void;
     setAutomaticPoint(name: string, setting: TemperaturSettings): void;
     stopAutomaticCheck(): void;
     checkAutomaticChange(): void;
+    onTemperaturChange(newTemperatur: number): void;
 }

package/lib/server/devices/{iLamp.d.ts → baseDeviceInterfaces/iLamp.d.ts}

@@ -1,4 +1,4 @@
-import { ActuatorSettings, RoomBase, TimeOfDay } from '../../models';
+import { ActuatorSettings, RoomBase, TimeOfDay } from '../../../models';
 import { IBaseDevice } from './iBaseDevice';
 export interface iLamp extends IBaseDevice {
     settings: ActuatorSettings;

package/lib/server/devices/{iMotionSensor.d.ts → baseDeviceInterfaces/iMotionSensor.d.ts}

@@ -1,4 +1,4 @@
-import { MotionSensorSettings } from '../../models';
+import { MotionSensorSettings } from '../../../models';
 import { IBaseDevice } from './iBaseDevice';
 export interface iMotionSensor extends IBaseDevice {
     settings: MotionSensorSettings;

package/lib/server/devices/{iShutter.d.ts → baseDeviceInterfaces/iShutter.d.ts}

@@ -1,4 +1,4 @@
-import { Fenster } from './groups';
+import { Fenster } from '../groups';
 import { IBaseDevice } from './iBaseDevice';
 export interface iShutter extends IBaseDevice {
     currentLevel: number;

package/lib/server/devices/{iTemperaturSensor.d.ts → baseDeviceInterfaces/iTemperaturSensor.d.ts}

@@ -1,5 +1,7 @@
 import { IBaseDevice } from './iBaseDevice';
+export declare const UNDEFINED_TEMP_VALUE = -99;
 export interface iTemperaturSensor extends IBaseDevice {
     iTemperatur: number;
     sTemperatur: string;
+    addTempChangeCallback(pCallback: (pValue: number) => void): void;
 }

package/lib/server/devices/{iTemperaturSensor.js → baseDeviceInterfaces/iTemperaturSensor.js}

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

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

@@ -0,0 +1,12 @@
+export * from './iBaseDevice';
+export * from './iButtonSwitch';
+export * from './iEnergyManager';
+export * from './iExcessEnergyConsumer';
+export * from './iHeater';
+export * from './iHumiditySensor';
+export * from './iIlluminationSensor';
+export * from './iLamp';
+export * from './iMotionSensor';
+export * from './iShutter';
+export * from './iTemperaturSensor';
+export * from './iVibrationSensor';

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

@@ -0,0 +1,28 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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("./iBaseDevice"), exports);
+__exportStar(require("./iButtonSwitch"), exports);
+__exportStar(require("./iEnergyManager"), exports);
+__exportStar(require("./iExcessEnergyConsumer"), exports);
+__exportStar(require("./iHeater"), exports);
+__exportStar(require("./iHumiditySensor"), exports);
+__exportStar(require("./iIlluminationSensor"), exports);
+__exportStar(require("./iLamp"), exports);
+__exportStar(require("./iMotionSensor"), exports);
+__exportStar(require("./iShutter"), exports);
+__exportStar(require("./iTemperaturSensor"), exports);
+__exportStar(require("./iVibrationSensor"), exports);

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

@@ -2,7 +2,7 @@ import { DeviceClusterType } from './device-cluster-type';
 import { DeviceList } from './device-list';
 import { IoBrokerBaseDevice } from './IoBrokerBaseDevice';
 import { OwnSonosDevice } from '../services';
-import { IBaseDevice } from './iBaseDevice';
+import { IBaseDevice } from './baseDeviceInterfaces';
 export declare class DeviceCluster {
     deviceMap: Map<DeviceClusterType, DeviceList>;
     constructor(deviceMap?: Map<DeviceClusterType, DeviceList>);

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

@@ -1,5 +1,5 @@
 import { OwnSonosDevice } from '../services';
-import { IBaseDevice } from './iBaseDevice';
+import { IBaseDevice } from './baseDeviceInterfaces';
 export declare class DeviceList {
     private _ids;
     constructor(_ids?: string[]);

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

@@ -30,6 +30,7 @@ export declare enum DeviceType {
     ZigbeeSonoffTemp = 216,
     ZigbeeAqaraOpple3Switch = 217,
     ZigbeeUbisysShutter = 218,
+    ZigbeeTuyaValve = 219,
     JsEnergyManager = 301,
     Wled = 1001
 }

package/lib/server/devices/deviceType.js

@@ -34,6 +34,7 @@ var DeviceType;
     DeviceType[DeviceType["ZigbeeSonoffTemp"] = 216] = "ZigbeeSonoffTemp";
     DeviceType[DeviceType["ZigbeeAqaraOpple3Switch"] = 217] = "ZigbeeAqaraOpple3Switch";
     DeviceType[DeviceType["ZigbeeUbisysShutter"] = 218] = "ZigbeeUbisysShutter";
+    DeviceType[DeviceType["ZigbeeTuyaValve"] = 219] = "ZigbeeTuyaValve";
     DeviceType[DeviceType["JsEnergyManager"] = 301] = "JsEnergyManager";
     DeviceType[DeviceType["Wled"] = 1001] = "Wled";
 })(DeviceType = exports.DeviceType || (exports.DeviceType = {}));

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

@@ -1,6 +1,5 @@
 import { deviceConfig, iRoomImportEnforcer } from '../../models';
-import { iEnergyManager } from './iEnergyManager';
-import { IBaseDevice } from './iBaseDevice';
+import { IBaseDevice, iEnergyManager } from './baseDeviceInterfaces';
 export declare class Devices {
     static IDENTIFIER_HOMEMATIC: string;
     static IDENTIFIER_JS: string;

package/lib/server/devices/devices.js

@@ -8,6 +8,7 @@ const deviceType_1 = require("./deviceType");
 const services_1 = require("../services");
 const DeviceInfo_1 = require("./DeviceInfo");
 const jsObject_1 = require("./jsObject");
+const zigbeeTuyaValve_1 = require("./zigbee/zigbeeTuyaValve");
 class Devices {
     constructor(pDeviceData, pRoomImportEnforcer) {
         // This forces import of rooms at correct timing, to allow devices to land in proper rooms.
@@ -134,6 +135,9 @@ class Devices {
             case 'UbisysShutter':
                 d = new zigbee_1.ZigbeeUbisysShutter(zigbeeInfo);
                 break;
+            case 'TuyaValve':
+                d = new zigbeeTuyaValve_1.ZigbeeTuyaValve(zigbeeInfo);
+                break;
             default:
                 services_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `No zigbee Device Type for ${zigbeeInfo.deviceType} defined`);
                 d = new zigbee_1.ZigbeeDevice(zigbeeInfo, deviceType_1.DeviceType.unknown);

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

@@ -1,9 +1,8 @@
 import { HmIpGriff } from '../hmIPDevices';
 import { FensterPosition } from '../models';
-import { iShutter } from '../iShutter';
+import { iShutter, iVibrationSensor } from '../baseDeviceInterfaces';
 import { BaseGroup } from './base-group';
 import { ZigbeeMagnetContact } from '../zigbee';
-import { iVibrationSensor } from '../iVibrationSensor';
 export declare class Fenster extends BaseGroup {
     noRolloOnSunrise: boolean;
     desiredPosition: number;

package/lib/server/devices/groups/base-group.d.ts

@@ -1,13 +1,12 @@
 import { GroupType } from './group-type';
 import { DeviceCluster } from '../device-cluster';
-import { RoomBase } from '../../../models/rooms/RoomBase';
-import { LogLevel } from '../../../models/logLevel';
+import { LogLevel, RoomBase } from '../../../models';
 export declare class BaseGroup {
     roomName: string;
     type: GroupType;
+    constructor(roomName: string, type: GroupType);
     protected _deviceCluster: DeviceCluster;
     get deviceCluster(): DeviceCluster;
-    constructor(roomName: string, type: GroupType);
     getRoom(): RoomBase;
     protected log(level: LogLevel, message: string): void;
 }

package/lib/server/devices/groups/base-group.js

@@ -3,9 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseGroup = void 0;
 const group_type_1 = require("./group-type");
 const device_cluster_1 = require("../device-cluster");
-const api_service_1 = require("../../services/api/api-service");
-const utils_1 = require("../../services/utils/utils");
-const log_service_1 = require("../../services/log-service/log-service");
+const services_1 = require("../../services");
 class BaseGroup {
     constructor(roomName, type) {
         this.roomName = roomName;
@@ -16,10 +14,10 @@ class BaseGroup {
         return this._deviceCluster;
     }
     getRoom() {
-        return utils_1.Utils.guard(api_service_1.API.getRoom(this.roomName));
+        return services_1.Utils.guard(services_1.API.getRoom(this.roomName));
     }
     log(level, message) {
-        log_service_1.ServerLogService.writeLog(level, message, {
+        services_1.ServerLogService.writeLog(level, message, {
             room: this.roomName,
             groupType: group_type_1.GroupType[this.type],
         });

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

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

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

@@ -5,6 +5,7 @@ const base_group_1 = require("./base-group");
 const group_type_1 = require("./group-type");
 const device_cluster_type_1 = require("../device-cluster-type");
 const device_list_1 = require("../device-list");
+const baseDeviceInterfaces_1 = require("../baseDeviceInterfaces");
 class HeatGroup extends base_group_1.BaseGroup {
     constructor(roomName, heaterIds, tempSensorIds, humiditySensorIds) {
         super(roomName, group_type_1.GroupType.Heating);
@@ -34,7 +35,7 @@ class HeatGroup extends base_group_1.BaseGroup {
         return Math.round((value / this.getHeater().length) * 10) / 10;
     }
     getHeater() {
-        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.Heater);
+        return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Heater);
     }
     getTempSensors() {
         return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.TemperaturSensor);
@@ -42,5 +43,49 @@ class HeatGroup extends base_group_1.BaseGroup {
     getHumiditySensors() {
         return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.HumiditySensor);
     }
+    initialize() {
+        this.getTempSensors().forEach((sensor) => {
+            sensor.addTempChangeCallback((_newVal) => {
+                this.recalcRoomTemperatur();
+            });
+        });
+    }
+    recalcRoomTemperatur() {
+        let temp = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
+        let count = 0;
+        this.getTempSensors().forEach((sensor) => {
+            const sensorValue = sensor.iTemperatur;
+            if (sensorValue === baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
+                return;
+            }
+            if (count === 0) {
+                count = 1;
+                temp = sensorValue;
+                return;
+            }
+            temp = (temp * count + sensorValue) / ++count;
+        });
+        this.getHeater().forEach((heaterAsSensor) => {
+            if (!heaterAsSensor.settings.useOwnTemperatur) {
+                return;
+            }
+            const sensorValue = heaterAsSensor.iTemperatur;
+            if (sensorValue === baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
+                return;
+            }
+            if (count === 0) {
+                count = 1;
+                temp = sensorValue;
+                return;
+            }
+            temp = (temp * count + sensorValue) / ++count;
+        });
+        if (temp === baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
+            return;
+        }
+        this.getHeater().forEach((heater) => {
+            heater.onTemperaturChange(temp);
+        });
+    }
 }
 exports.HeatGroup = HeatGroup;