hoffmation-base 0.1.41-17 → 0.1.41-22

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;

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

@@ -1,6 +1,6 @@
 import { ZigbeeIkeaSteckdose, ZigbeeIlluLedRGBCCT } from '../zigbee';
 import { BaseGroup } from './base-group';
-import { iLamp } from '../iLamp';
+import { iLamp } from '../baseDeviceInterfaces';
 import { TimeOfDay } from '../../../models';
 export declare class LampenGroup extends BaseGroup {
     constructor(roomName: string, lampenIds?: string[], steckerIds?: string[], ledIds?: string[]);

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

@@ -1,6 +1,6 @@
 import { HmIpPraezenz } from '../hmIPDevices';
 import { BaseGroup } from './base-group';
-import { iMotionSensor } from '../iMotionSensor';
+import { iMotionSensor } from '../baseDeviceInterfaces';
 export declare class PraesenzGroup extends BaseGroup {
     private _lastMovement;
     private _lastLeftTimeout;

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

@@ -1,7 +1,7 @@
-import { ZigbeeHeimanSmoke } from '../zigbee/zigbeeHeimanSmoke';
+import { ZigbeeHeimanSmoke } from '../zigbee';
 import { BaseGroup } from './base-group';
 export declare class SmokeGroup extends BaseGroup {
-    getSmokeDetectors(): ZigbeeHeimanSmoke[];
     constructor(roomName: string, smokeDetectorIds: string[]);
+    getSmokeDetectors(): ZigbeeHeimanSmoke[];
     stopAlarm(): void;
 }

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

@@ -6,13 +6,13 @@ const device_cluster_type_1 = require("../device-cluster-type");
 const group_type_1 = require("./group-type");
 const device_list_1 = require("../device-list");
 class SmokeGroup extends base_group_1.BaseGroup {
-    getSmokeDetectors() {
-        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.SmokeDetector);
-    }
     constructor(roomName, smokeDetectorIds) {
         super(roomName, group_type_1.GroupType.Smoke);
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.SmokeDetector, new device_list_1.DeviceList(smokeDetectorIds));
     }
+    getSmokeDetectors() {
+        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.SmokeDetector);
+    }
     stopAlarm() {
         for (const d of this.getSmokeDetectors()) {
             d.stopAlarm(true);

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

@@ -1,4 +1,4 @@
-import { OwnSonosDevice } from '../../services/Sonos/sonos-service';
+import { OwnSonosDevice } from '../../services';
 import { BaseGroup } from './base-group';
 export declare class SonosGroup extends BaseGroup {
     private _playing;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SonosGroup = void 0;
-const utils_1 = require("../../services/utils/utils");
+const services_1 = require("../../services");
 const base_group_1 = require("./base-group");
 const device_cluster_type_1 = require("../device-cluster-type");
 const group_type_1 = require("./group-type");
@@ -17,7 +17,7 @@ class SonosGroup extends base_group_1.BaseGroup {
     }
     playRadio(radioUrl) {
         this.getOwnSonosDevices().forEach((s) => {
-            utils_1.Utils.guardedTimeout(() => {
+            services_1.Utils.guardedTimeout(() => {
                 var _a;
                 (_a = s.device) === null || _a === void 0 ? void 0 : _a.SetAVTransportURI(radioUrl);
             }, 1500);

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

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

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

@@ -1,7 +1,7 @@
-import { ZigbeeAquaraWater } from '../zigbee/zigbeeAquaraWater';
+import { ZigbeeAquaraWater } from '../zigbee';
 import { BaseGroup } from './base-group';
 export declare class WaterGroup extends BaseGroup {
-    getWaterDetectors(): ZigbeeAquaraWater[];
     constructor(roomName: string, waterDetectorIds: string[]);
+    getWaterDetectors(): ZigbeeAquaraWater[];
     stopAlarm(): void;
 }

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

@@ -6,13 +6,13 @@ const device_cluster_type_1 = require("../device-cluster-type");
 const group_type_1 = require("./group-type");
 const device_list_1 = require("../device-list");
 class WaterGroup extends base_group_1.BaseGroup {
-    getWaterDetectors() {
-        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.WaterDetectors);
-    }
     constructor(roomName, waterDetectorIds) {
         super(roomName, group_type_1.GroupType.Water);
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.WaterDetectors, new device_list_1.DeviceList(waterDetectorIds));
     }
+    getWaterDetectors() {
+        return this.deviceCluster.getIoBrokerDevicesByType(device_cluster_type_1.DeviceClusterType.WaterDetectors);
+    }
     stopAlarm() {
         for (const d of this.getWaterDetectors()) {
             d.stopAlarm(true);

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

@@ -2,9 +2,9 @@
 import { HmIPDevice } from './hmIpDevice';
 import { DeviceInfo } from '../DeviceInfo';
 export declare class HmIpAccessPoint extends HmIPDevice {
+    constructor(pInfo: DeviceInfo);
     private _ip;
     get ip(): string;
-    constructor(pInfo: DeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     private updateBaseInformation;
 }

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpAccessPoint = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
-const logLevel_1 = require("../../../models/logLevel");
+const models_1 = require("../../../models");
 class HmIpAccessPoint extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpAccessPoint);
@@ -13,7 +13,7 @@ class HmIpAccessPoint extends hmIpDevice_1.HmIPDevice {
         return this._ip;
     }
     update(idSplit, state, initial = false) {
-        this.log(logLevel_1.LogLevel.DeepTrace, `AP Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        this.log(models_1.LogLevel.DeepTrace, `AP Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case '0':

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

@@ -2,8 +2,7 @@
 import { HmIPDevice } from './hmIpDevice';
 import { MotionSensorSettings } from '../../../models';
 import { DeviceInfo } from '../DeviceInfo';
-import { iIlluminationSensor } from '../iIlluminationSensor';
-import { iMotionSensor } from '../iMotionSensor';
+import { iIlluminationSensor, iMotionSensor } from '../baseDeviceInterfaces';
 export declare class HmIpBewegung extends HmIPDevice implements iIlluminationSensor, iMotionSensor {
     private static MOVEMENT_DETECTION;
     private static CURRENT_ILLUMINATION;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIPDevice = void 0;
-const logLevel_1 = require("../../../models/logLevel");
+const models_1 = require("../../../models");
 const IoBrokerBaseDevice_1 = require("../IoBrokerBaseDevice");
 class HmIPDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     constructor(pInfo, pType) {
@@ -10,10 +10,10 @@ class HmIPDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     }
     update(idSplit, state, initial = false, pOverride = false) {
         if (!pOverride) {
-            this.log(logLevel_1.LogLevel.Trace, `Keine Update Überschreibung :\n\tID: ${idSplit.join('.')}`);
-            this.log(logLevel_1.LogLevel.DeepTrace, `Data: ${JSON.stringify(state)}`);
+            this.log(models_1.LogLevel.Trace, `Keine Update Überschreibung :\n\tID: ${idSplit.join('.')}`);
+            this.log(models_1.LogLevel.DeepTrace, `Data: ${JSON.stringify(state)}`);
         }
-        this.log(logLevel_1.LogLevel.DeepTrace, `Base-Device Update for ${this.info.customName}("${idSplit.join('.')}", ${state}, ${initial}, ${pOverride})`);
+        this.log(models_1.LogLevel.DeepTrace, `Base-Device Update for ${this.info.customName}("${idSplit.join('.')}", ${state}, ${initial}, ${pOverride})`);
         if (idSplit[3] !== '0') {
             // Dies ist etwas Gerätespezifisches
             return;
@@ -25,7 +25,7 @@ class HmIPDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
             case 'LOW_BAT':
                 const newBatLowVal = state.val;
                 if (newBatLowVal) {
-                    this.log(logLevel_1.LogLevel.Alert, `!!BATTERIE FAST LEER!!`);
+                    this.log(models_1.LogLevel.Alert, `!!BATTERIE FAST LEER!!`);
                 }
                 break;
         }

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

@@ -1,8 +1,8 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
 import { DeviceInfo } from '../DeviceInfo';
-import { FensterPosition } from '../models/FensterPosition';
-import { Fenster } from '../groups/Fenster';
+import { FensterPosition } from '../models';
+import { Fenster } from '../groups';
 import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
 export declare class HmIpGriff extends HmIPDevice {
     position: FensterPosition;
@@ -14,10 +14,10 @@ export declare class HmIpGriff extends HmIPDevice {
     private _fenster;
     private _helpingRoomTemp;
     constructor(pInfo: DeviceInfo);
+    set Fenster(value: Fenster);
     addOffenCallback(pCallback: (pValue: boolean) => void): void;
     addKippCallback(pCallback: (pValue: boolean) => void): void;
     addClosedCallback(pCallback: (pValue: boolean) => void): void;
-    set Fenster(value: Fenster);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     updatePosition(pValue: FensterPosition): void;
     toJSON(): Partial<IoBrokerBaseDevice>;

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

@@ -6,16 +6,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpGriff = void 0;
 const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
-const utils_1 = require("../../services/utils/utils");
-const weather_service_1 = require("../../services/weather/weather-service");
-const telegram_service_1 = require("../../services/Telegram/telegram-service");
-const FensterPosition_1 = require("../models/FensterPosition");
-const logLevel_1 = require("../../../models/logLevel");
+const services_1 = require("../../services");
+const models_1 = require("../models");
+const models_2 = require("../../../models");
 const lodash_1 = __importDefault(require("lodash"));
 class HmIpGriff extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpGriff);
-        this.position = FensterPosition_1.FensterPosition.geschlossen;
+        this.position = models_1.FensterPosition.geschlossen;
         this._kippCallback = [];
         this._closedCallback = [];
         this._offenCallback = [];
@@ -23,6 +21,9 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
         this._fenster = undefined;
         this._helpingRoomTemp = false;
     }
+    set Fenster(value) {
+        this._fenster = value;
+    }
     addOffenCallback(pCallback) {
         this._offenCallback.push(pCallback);
     }
@@ -32,11 +33,8 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
     addClosedCallback(pCallback) {
         this._closedCallback.push(pCallback);
     }
-    set Fenster(value) {
-        this._fenster = value;
-    }
     update(idSplit, state, initial = false) {
-        this.log(logLevel_1.LogLevel.DeepTrace, `Griff Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
+        this.log(models_2.LogLevel.DeepTrace, `Griff Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case '1':
@@ -50,7 +48,7 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
         if (pValue === this.position) {
             return;
         }
-        this.log(logLevel_1.LogLevel.Trace, `Update Fenstergriff auf Position "${FensterPosition_1.FensterPosition[pValue]}"`);
+        this.log(models_2.LogLevel.Trace, `Update Fenstergriff auf Position "${models_1.FensterPosition[pValue]}"`);
         this.position = pValue;
         for (const c1 of this._closedCallback) {
             c1(pValue === 0);
@@ -61,39 +59,39 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
         for (const c3 of this._offenCallback) {
             c3(pValue === 2);
         }
-        if (pValue === FensterPosition_1.FensterPosition.geschlossen) {
+        if (pValue === models_1.FensterPosition.geschlossen) {
             if (this._iOpenTimeout !== undefined) {
                 clearInterval(this._iOpenTimeout);
-                this.log(logLevel_1.LogLevel.Info, `Fenster nach ${this.minutesOpen} Minuten geschlossen`);
+                this.log(models_2.LogLevel.Info, `Fenster nach ${this.minutesOpen} Minuten geschlossen`);
                 this.minutesOpen = 0;
                 this._iOpenTimeout = undefined;
             }
             return;
         }
         else if (this._iOpenTimeout === undefined) {
-            this._iOpenTimeout = utils_1.Utils.guardedInterval(() => {
+            this._iOpenTimeout = services_1.Utils.guardedInterval(() => {
                 var _a;
                 this.minutesOpen++;
                 const heatgroup = (_a = this._fenster) === null || _a === void 0 ? void 0 : _a.getRoom().HeatGroup;
                 if (heatgroup !== undefined) {
                     const desiredTemp = heatgroup.desiredTemp;
                     const currentTemp = heatgroup.currentTemp;
-                    const outSideTemp = weather_service_1.WeatherService.getCurrentTemp();
+                    const outSideTemp = services_1.WeatherService.getCurrentTemp();
                     // Check if any of these values are unavailable
                     if (desiredTemp > -99 && currentTemp > -99 && outSideTemp > -99) {
                         const wouldHelp = (desiredTemp < currentTemp && outSideTemp < currentTemp) ||
                             (desiredTemp > currentTemp && outSideTemp > currentTemp);
                         if (!wouldHelp && this._helpingRoomTemp) {
                             const info = `Das Fenster sollte geschlossen werden, es hilft dem Raum nicht mehr`;
-                            this.log(logLevel_1.LogLevel.Info, info);
-                            telegram_service_1.TelegramService.inform(info);
+                            this.log(models_2.LogLevel.Info, info);
+                            services_1.TelegramService.inform(info);
                             this._helpingRoomTemp = false;
                         }
                         else if (wouldHelp && !this._helpingRoomTemp) {
                             this._helpingRoomTemp = true;
                             const info = `Das Fenster hilft der Innentemperatur ihr Ziel von ${desiredTemp} zu erreichen. Draußen sind es ${outSideTemp}. Du wirst informiert wenn es nicht mehr hilft.`;
-                            this.log(logLevel_1.LogLevel.Info, info);
-                            telegram_service_1.TelegramService.inform(info);
+                            this.log(models_2.LogLevel.Info, info);
+                            services_1.TelegramService.inform(info);
                             return;
                         }
                         else if (wouldHelp && this._helpingRoomTemp) {
@@ -101,18 +99,18 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
                         }
                     }
                 }
-                const message = `Fenster seit ${this.minutesOpen} Minuten auf Position ${FensterPosition_1.FensterPosition[this.position]}`;
+                const message = `Fenster seit ${this.minutesOpen} Minuten auf Position ${models_1.FensterPosition[this.position]}`;
                 switch (this.minutesOpen) {
                     case 15:
                     case 30:
                     case 60:
                     case 120:
                     case 240:
-                        this.log(logLevel_1.LogLevel.Info, message);
-                        telegram_service_1.TelegramService.inform(message);
+                        this.log(models_2.LogLevel.Info, message);
+                        services_1.TelegramService.inform(message);
                         break;
                     default:
-                        this.log(logLevel_1.LogLevel.Trace, message);
+                        this.log(models_2.LogLevel.Trace, message);
                         break;
                 }
             }, 60000, this);

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

@@ -1,20 +1,24 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
 import { DeviceInfo } from '../DeviceInfo';
-import { TemperaturSettings } from '../../../models';
-import { iTemperaturSensor } from '../iTemperaturSensor';
-import { iHumiditySensor } from '../iHumiditySensor';
-import { iHeater } from '../iHeater';
+import { HeaterSettings, TemperaturSettings } from '../../../models';
+import { iHeater, iHumiditySensor, iTemperaturSensor } from '../baseDeviceInterfaces';
 export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperaturSensor, iHumiditySensor, iHeater {
-    private _automaticMode;
+    settings: HeaterSettings;
     private _iAutomaticInterval;
+    private _initialSeasonCheckDone;
     private _level;
-    private _temperatur;
     private _setPointTemperaturID;
-    private _automaticFallBackTemperatur;
     private _automaticPoints;
     private _humidityCallbacks;
+    private _temperaturCallbacks;
     constructor(pInfo: DeviceInfo);
+    protected _seasonTurnOff: boolean;
+    get seasonTurnOff(): boolean;
+    set seasonTurnOff(value: boolean);
+    private _temperatur;
+    get temperatur(): number;
+    private set temperatur(value);
     private _humidity;
     get humidity(): number;
     private set humidity(value);
@@ -25,6 +29,8 @@ export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperaturSen
     get iLevel(): number;
     get sTemperatur(): string;
     get iTemperatur(): number;
+    private _roomTemperatur;
+    private set roomTemperatur(value);
     addHumidityCallback(pCallback: (pValue: number) => void): void;
     deleteAutomaticPoint(name: string): void;
     getBelongingHeizungen(): iHeater[];
@@ -32,5 +38,8 @@ export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperaturSen
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     stopAutomaticCheck(): void;
     checkAutomaticChange(): void;
+    addTempChangeCallback(pCallback: (pValue: number) => void): void;
+    onTemperaturChange(newTemperatur: number): void;
     private updateBaseInformation;
+    private checkSeasonTurnOff;
 }

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

@@ -5,21 +5,52 @@ const hmIpDevice_1 = require("./hmIpDevice");
 const deviceType_1 = require("../deviceType");
 const services_1 = require("../../services");
 const models_1 = require("../../../models");
+const baseDeviceInterfaces_1 = require("../baseDeviceInterfaces");
 const device_cluster_type_1 = require("../device-cluster-type");
 class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpHeizgruppe);
-        this._automaticMode = true;
+        this.settings = new models_1.HeaterSettings();
+        this._initialSeasonCheckDone = false;
         this._level = 0;
-        this._temperatur = 0;
         this._setPointTemperaturID = '';
-        this._automaticFallBackTemperatur = 20;
         this._automaticPoints = {};
         this._humidityCallbacks = [];
+        this._temperaturCallbacks = [];
+        this._seasonTurnOff = false;
+        this._temperatur = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this._humidity = 0;
         this._desiredTemperatur = 0;
+        this._roomTemperatur = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this._setPointTemperaturID = `${this.info.fullID}.1.SET_POINT_TEMPERATURE`;
         this._iAutomaticInterval = services_1.Utils.guardedInterval(this.checkAutomaticChange, 300000, this); // Alle 5 Minuten prüfen
+        services_1.TimeCallbackService.addCallback(new models_1.TimeCallback(`${this.info.fullID} Season Check`, models_1.TimeCallbackType.TimeOfDay, () => {
+            this.checkSeasonTurnOff();
+        }, 0, 2, 0));
+    }
+    get seasonTurnOff() {
+        return this._seasonTurnOff;
+    }
+    set seasonTurnOff(value) {
+        this._seasonTurnOff = value;
+        if (value) {
+            this.setState(this._setPointTemperaturID, 5);
+        }
+        else {
+            this.setState(this._setPointTemperaturID, this.desiredTemperatur);
+        }
+    }
+    get temperatur() {
+        if (this.settings.useOwnTemperatur) {
+            return this._temperatur;
+        }
+        return this._roomTemperatur;
+    }
+    set temperatur(val) {
+        this._temperatur = val;
+        for (const cb of this._temperaturCallbacks) {
+            cb(val);
+        }
     }
     get humidity() {
         return this._humidity;
@@ -34,7 +65,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         return this._desiredTemperatur;
     }
     set desiredTemperatur(val) {
-        this.setState(this._setPointTemperaturID, val, () => {
+        this.setState(this._setPointTemperaturID, this.seasonTurnOff ? 5 : val, () => {
             this.log(models_1.LogLevel.Info, `Changed temperature of to "${val}.`);
         }, (err) => {
             this.log(models_1.LogLevel.Error, `Temperaturänderung ergab Fehler ${err}.`);
@@ -47,10 +78,13 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         return this._level;
     }
     get sTemperatur() {
-        return `${this._temperatur}°C`;
+        return `${this.temperatur}°C`;
     }
     get iTemperatur() {
-        return this._temperatur;
+        return this.temperatur;
+    }
+    set roomTemperatur(value) {
+        this._roomTemperatur = value;
     }
     addHumidityCallback(pCallback) {
         this._humidityCallbacks.push(pCallback);
@@ -88,26 +122,38 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
     }
     checkAutomaticChange() {
         var _a, _b, _c;
-        if (!this._automaticMode) {
+        if (!this._initialSeasonCheckDone) {
+            this.checkSeasonTurnOff();
+        }
+        if (!this.settings.automaticMode || this.seasonTurnOff) {
             (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.addTemperaturDataPoint(this);
             return;
         }
         const setting = models_1.TemperaturSettings.getActiveSetting(this._automaticPoints, new Date());
         if (setting === undefined) {
             this.log(models_1.LogLevel.Warn, `Undefined Heating Timestamp.`);
-            this.desiredTemperatur = this._automaticFallBackTemperatur;
+            this.desiredTemperatur = this.settings.automaticFallBackTemperatur;
             return;
         }
         if (this._desiredTemperatur !== setting.temperatur) {
             this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${setting.temperatur}°C`);
-            this.desiredTemperatur = (_b = setting.temperatur) !== null && _b !== void 0 ? _b : this._automaticFallBackTemperatur;
+            this.desiredTemperatur = (_b = setting.temperatur) !== null && _b !== void 0 ? _b : this.settings.automaticFallBackTemperatur;
         }
         (_c = services_1.Utils.dbo) === null || _c === void 0 ? void 0 : _c.addTemperaturDataPoint(this);
     }
+    addTempChangeCallback(pCallback) {
+        this._temperaturCallbacks.push(pCallback);
+        if (this._temperatur > baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
+            pCallback(this._temperatur);
+        }
+    }
+    onTemperaturChange(newTemperatur) {
+        this.roomTemperatur = newTemperatur;
+    }
     updateBaseInformation(name, state) {
         switch (name) {
             case 'ACTUAL_TEMPERATURE':
-                this._temperatur = state.val;
+                this.temperatur = state.val;
                 break;
             case 'LEVEL':
                 this._level = state.val;
@@ -121,5 +167,12 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
                 break;
         }
     }
+    checkSeasonTurnOff() {
+        const desiredState = services_1.Utils.beetweenDays(new Date(), this.settings.seasonTurnOffDay, this.settings.seasonTurnOnDay);
+        if (desiredState !== this.seasonTurnOff) {
+            this.seasonTurnOff = desiredState;
+        }
+        this._initialSeasonCheckDone = true;
+    }
 }
 exports.HmIpHeizgruppe = HmIpHeizgruppe;

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

@@ -5,11 +5,11 @@ export declare class HmIpHeizung extends HmIPDevice {
     private _temperatur;
     private _level;
     private _adaptionState;
+    constructor(pInfo: DeviceInfo);
     private _desiredTemperatur;
     get desiredTemperatur(): number;
     get iLevel(): number;
     get iTemperatur(): number;
-    constructor(pInfo: DeviceInfo);
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     private updateBaseInformation;
 }

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HmIpHeizung = void 0;
 const deviceType_1 = require("../deviceType");
-const logLevel_1 = require("../../../models/logLevel");
+const models_1 = require("../../../models");
 const hmIpDevice_1 = require("./hmIpDevice");
 var HmIpHeizungAdaptionStates;
 (function (HmIpHeizungAdaptionStates) {
@@ -33,7 +33,7 @@ class HmIpHeizung extends hmIpDevice_1.HmIPDevice {
         return this._temperatur;
     }
     update(idSplit, state, initial = false) {
-        this.log(logLevel_1.LogLevel.DeepTrace, `Heizung Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        this.log(models_1.LogLevel.DeepTrace, `Heizung Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case '1':
@@ -53,11 +53,11 @@ class HmIpHeizung extends hmIpDevice_1.HmIPDevice {
                 this._adaptionState = state.val;
                 if (this._adaptionState !== HmIpHeizungAdaptionStates.AdaptionInProgress &&
                     this._adaptionState !== HmIpHeizungAdaptionStates.AdaptionDone) {
-                    this.log(logLevel_1.LogLevel.Alert, `Akward adaption state: ${HmIpHeizungAdaptionStates[this._adaptionState]}`);
+                    this.log(models_1.LogLevel.Alert, `Akward adaption state: ${HmIpHeizungAdaptionStates[this._adaptionState]}`);
                 }
                 break;
             case 'SET_POINT_TEMPERATURE':
-                this.log(logLevel_1.LogLevel.Trace, `Heizung Update Soll-Temperatur JSON: ${JSON.stringify(state)}`);
+                this.log(models_1.LogLevel.Trace, `Heizung Update Soll-Temperatur JSON: ${JSON.stringify(state)}`);
                 this._desiredTemperatur = state.val;
                 break;
         }

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

@@ -2,7 +2,7 @@
 import { HmIPDevice } from './hmIpDevice';
 import { ActuatorSettings, TimeOfDay } from '../../../models';
 import { DeviceInfo } from '../DeviceInfo';
-import { iLamp } from '../iLamp';
+import { iLamp } from '../baseDeviceInterfaces';
 export declare class HmIpLampe extends HmIPDevice implements iLamp {
     lightOn: boolean;
     queuedLightValue: boolean | null;

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

@@ -1,7 +1,7 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
 import { DeviceInfo } from '../DeviceInfo';
-import { iIlluminationSensor } from '../iIlluminationSensor';
+import { iIlluminationSensor } from '../baseDeviceInterfaces';
 export declare class HmIpPraezenz extends HmIPDevice implements iIlluminationSensor {
     private static PRESENCE_DETECTION;
     private static CURRENT_ILLUMINATION;