hoffmation-base 3.0.0-beta.0 → 3.0.0-beta.10

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

@@ -18,6 +18,15 @@ class WindowGroup extends base_group_1.BaseGroup {
             return w.anyShutterDown;
         });
     }
+    /**
+     * Checks if any handle of any window is open
+     * @returns {boolean} True if there is atleast one handle that is open.
+     */
+    get anyWindowOpen() {
+        return this.windows.some((w) => {
+            return w.anyHandleNotClosed;
+        });
+    }
     constructor(roomName, windows) {
         super(roomName, group_type_1.GroupType.WindowGroup);
         this.windows = windows;
@@ -36,6 +45,15 @@ class WindowGroup extends base_group_1.BaseGroup {
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Shutter, new device_list_1.DeviceList(shutterIds));
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.MagnetContact, new device_list_1.DeviceList(magnetIds));
     }
+    /**
+     * Adds Callbacks to each window and their handles.
+     * @param cb - The callback to execute on met condition.
+     */
+    addHandleChangeCallback(cb) {
+        this.windows.forEach((f) => {
+            f.addHandleChangeCallback(cb);
+        });
+    }
     setDesiredPosition(c) {
         this.windows.forEach((f) => {
             f.setDesiredPosition(c);

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

@@ -1,6 +1,7 @@
 import { iDisposable } from '../../services';
 import { WindowPosition } from '../models';
 import { Window } from '../groups';
+import { HandleChangeAction } from '../../../models';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { HmIPDevice } from './hmIpDevice';
 import { iBatteryDevice, iHandleSensor } from '../baseDeviceInterfaces';
@@ -34,6 +35,8 @@ export declare class HmIpGriff extends HmIPDevice implements iHandleSensor, iBat
     /** @inheritDoc */
     addClosedCallback(pCallback: (pValue: boolean) => void): void;
     /** @inheritDoc */
+    addHandleChangeCallback(cb: (handleChangeAction: HandleChangeAction) => void): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     /** @inheritDoc */
     dispose(): void;

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

@@ -55,6 +55,10 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
         this.handleSensor.addClosedCallback(pCallback);
     }
     /** @inheritDoc */
+    addHandleChangeCallback(cb) {
+        this.handleSensor.addHandleChangeCallback(cb);
+    }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Griff Update: JSON: ${JSON.stringify(state)}ID: ${idSplit.join('.')}`);
         super.update(idSplit, state, initial, true);

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

@@ -1,6 +1,6 @@
 import { HmIPDevice } from './hmIpDevice';
 import { iDisposable } from '../../services';
-import { HeaterSettings, HumiditySensorChangeAction, TemperatureSensorChangeAction } from '../../../models';
+import { HandleChangeAction, HeaterSettings, HumiditySensorChangeAction, TemperatureSensorChangeAction } from '../../../models';
 import { iHeater, iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { HumiditySensor, TemperatureSensor } from '../sharedFunctions';
@@ -13,10 +13,12 @@ export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSe
     humiditySensor: HumiditySensor;
     /** @inheritDoc */
     settings: HeaterSettings;
+    private readonly _setWindowOpenID;
     private _iAutomaticInterval;
     private _initialSeasonCheckDone;
     private _level;
     private _setPointTemperatureID;
+    private _windowOpen;
     constructor(pInfo: IoBrokerDeviceInfo);
     protected _seasonTurnOff: boolean;
     /** @inheritDoc */
@@ -41,6 +43,8 @@ export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSe
     /** @inheritDoc */
     get roomTemperature(): number;
     /** @inheritDoc */
+    get windowOpen(): boolean;
+    /** @inheritDoc */
     addHumidityCallback(pCallback: (action: HumiditySensorChangeAction) => void): void;
     getBelongingHeizungen(): iHeater[];
     /** @inheritDoc */
@@ -55,8 +59,10 @@ export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSe
     persistTemperaturSensor(): void;
     /** @inheritDoc */
     persistHeater(): void;
+    onHandleChange(_action: HandleChangeAction): void;
     /** @inheritDoc */
     dispose(): void;
     private checkSeasonTurnOff;
+    private onWindowOpenChange;
     private updateBaseInformation;
 }

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

@@ -21,9 +21,11 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         this.humiditySensor = new sharedFunctions_1.HumiditySensor(this);
         /** @inheritDoc */
         this.settings = new models_1.HeaterSettings();
+        this._setWindowOpenID = '';
         this._initialSeasonCheckDone = false;
         this._level = 0;
         this._setPointTemperatureID = '';
+        this._windowOpen = false;
         this._seasonTurnOff = false;
         this._desiredTemperature = 0;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.temperatureSensor);
@@ -91,6 +93,10 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         return this.temperatureSensor.roomTemperature;
     }
     /** @inheritDoc */
+    get windowOpen() {
+        return this._windowOpen;
+    }
+    /** @inheritDoc */
     addHumidityCallback(pCallback) {
         this.humiditySensor.addHumidityCallback(pCallback);
     }
@@ -145,6 +151,18 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistHeater(this);
     }
+    onHandleChange(_action) {
+        var _a;
+        if (this.room.WindowGroup === undefined) {
+            return;
+        }
+        const newState = (_a = this.room.WindowGroup) === null || _a === void 0 ? void 0 : _a.anyWindowOpen;
+        if (newState === this._windowOpen) {
+            return;
+        }
+        this._windowOpen = newState;
+        this.onWindowOpenChange(this._windowOpen);
+    }
     /** @inheritDoc */
     dispose() {
         this.temperatureSensor.dispose();
@@ -165,6 +183,12 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         }
         this._initialSeasonCheckDone = true;
     }
+    onWindowOpenChange(pValue) {
+        if (!this._setWindowOpenID) {
+            return;
+        }
+        this.setState(this._setWindowOpenID, pValue);
+    }
     updateBaseInformation(name, state) {
         switch (name) {
             case 'ACTUAL_TEMPERATURE':

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

@@ -1,9 +1,8 @@
 import { WindowPosition } from '../models';
-import { LogLevel } from '../../../models';
+import { HandleChangeAction, iJsonOmitKeys, LogLevel } from '../../../models';
 import { iDisposable, LogDebugType } from '../../services';
 import { Window } from '../groups';
 import { iHandleSensor } from '../baseDeviceInterfaces';
-import { iJsonOmitKeys } from '../../../models/iJsonOmitKeys';
 export declare class HandleSensor implements iDisposable, iJsonOmitKeys {
     private readonly _device;
     /** @inheritDoc */
@@ -24,6 +23,7 @@ export declare class HandleSensor implements iDisposable, iJsonOmitKeys {
     private _kippCallback;
     private _closedCallback;
     private _offenCallback;
+    private _handleChangeCallback;
     private _iOpenTimeout;
     private _helpingRoomTemp;
     constructor(_device: iHandleSensor);
@@ -35,6 +35,7 @@ export declare class HandleSensor implements iDisposable, iJsonOmitKeys {
     addKippCallback(pCallback: (pValue: boolean) => void): void;
     /** @inheritDoc */
     addClosedCallback(pCallback: (pValue: boolean) => void): void;
+    addHandleChangeCallback(cb: (handleChangeAction: HandleChangeAction) => void): void;
     dispose(): void;
     /**
      * Persists the handle sensor state to the persistence layer

package/lib/server/devices/sharedFunctions/handleSensor.js

@@ -21,6 +21,7 @@ class HandleSensor {
         this._kippCallback = [];
         this._closedCallback = [];
         this._offenCallback = [];
+        this._handleChangeCallback = [];
         this._helpingRoomTemp = false;
     }
     get _settings() {
@@ -35,6 +36,7 @@ class HandleSensor {
         }
         this.log(models_2.LogLevel.Debug, `Update Windowhandle to position "${models_1.WindowPosition[pValue]}"`);
         this.position = pValue;
+        const handleChangeAction = new models_2.HandleChangeAction(this._device);
         for (const c1 of this._closedCallback) {
             c1(pValue === 0);
         }
@@ -44,6 +46,9 @@ class HandleSensor {
         for (const c3 of this._offenCallback) {
             c3(pValue === 2);
         }
+        for (const c4 of this._handleChangeCallback) {
+            c4(handleChangeAction);
+        }
         this.persist();
         if (pValue === models_1.WindowPosition.closed) {
             if (this._iOpenTimeout !== undefined) {
@@ -121,6 +126,9 @@ class HandleSensor {
     addClosedCallback(pCallback) {
         this._closedCallback.push(pCallback);
     }
+    addHandleChangeCallback(cb) {
+        this._handleChangeCallback.push(cb);
+    }
     dispose() {
         if (this._iOpenTimeout) {
             clearInterval(this._iOpenTimeout);

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

@@ -8,6 +8,12 @@ export declare class TemperatureSensor implements iJsonOmitKeys {
      * The current room temperature as a number in Celsius
      */
     roomTemperature: number;
+    /**
+     * Temperature correction coefficient to mitigate outdoor temperature, e.g. if this is closely placed to a window.
+     * @remarks Default: 0 and difference to 21°C
+     * @example With outdoor temp of 10°C and a coefficient of 0.5, the temperature correction will be +5.5°C
+     */
+    outdoorTemperatureCorrectionCoefficient: number;
     /**
      * The interval to persist the temperature sensor information
      */

package/lib/server/devices/sharedFunctions/temperatureSensor.js

@@ -13,6 +13,12 @@ class TemperatureSensor {
          * The current room temperature as a number in Celsius
          */
         this.roomTemperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
+        /**
+         * Temperature correction coefficient to mitigate outdoor temperature, e.g. if this is closely placed to a window.
+         * @remarks Default: 0 and difference to 21°C
+         * @example With outdoor temp of 10°C and a coefficient of 0.5, the temperature correction will be +5.5°C
+         */
+        this.outdoorTemperatureCorrectionCoefficient = 0;
         /**
          * The interval to persist the temperature sensor information
          */
@@ -23,9 +29,13 @@ class TemperatureSensor {
         this._temperaturCallbacks = [];
     }
     set temperature(val) {
-        this._temperature = val;
+        let correctedValue = val;
+        if (this.outdoorTemperatureCorrectionCoefficient !== 0 && services_1.WeatherService.currentTemp !== baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
+            correctedValue = val + this.outdoorTemperatureCorrectionCoefficient * (21 - services_1.WeatherService.currentTemp);
+        }
+        this._temperature = correctedValue;
         for (const cb of this._temperaturCallbacks) {
-            cb(new models_1.TemperatureSensorChangeAction(this._device, val));
+            cb(new models_1.TemperatureSensorChangeAction(this._device, correctedValue));
         }
     }
     get temperature() {

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

@@ -1,14 +1,16 @@
 import { ShellyDevice } from './shellyDevice';
-import { iBatteryDevice, iHeater } from '../baseDeviceInterfaces';
-import { HeaterSettings } from '../../../models';
+import { iBatteryDevice, iHeater, iTemperatureSensor } from '../baseDeviceInterfaces';
+import { HandleChangeAction, HeaterSettings, TemperatureSensorChangeAction } from '../../../models';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-import { Battery } from '../sharedFunctions';
-export declare class ShellyTrv extends ShellyDevice implements iHeater, iBatteryDevice {
+import { Battery, TemperatureSensor } from '../sharedFunctions';
+export declare class ShellyTrv extends ShellyDevice implements iHeater, iTemperatureSensor, iBatteryDevice {
     /** @inheritDoc */
     readonly battery: Battery;
     /** @inheritDoc */
     settings: HeaterSettings;
     /** @inheritDoc */
+    temperatureSensor: TemperatureSensor;
+    /** @inheritDoc */
     readonly persistHeaterInterval: NodeJS.Timeout;
     protected _seasonTurnOff: boolean;
     protected _roomTemperature: number;
@@ -19,7 +21,6 @@ export declare class ShellyTrv extends ShellyDevice implements iHeater, iBattery
     private _level;
     private _minimumValveLevel;
     private _recalcTimeout;
-    private _temperatur;
     private _targetTempVal;
     private _desiredTemperatur;
     private _useExternalTemperatureEnabled;
@@ -29,7 +30,9 @@ export declare class ShellyTrv extends ShellyDevice implements iHeater, iBattery
     private readonly _setExternalTempId;
     private readonly _setEnableExternalTempId;
     private readonly _setPointTemperaturID;
+    private readonly _setWindowOpenID;
     private readonly _valvePosId;
+    private _windowOpen;
     constructor(pInfo: IoBrokerDeviceInfo);
     /** @inheritDoc */
     get batteryLevel(): number;
@@ -47,9 +50,15 @@ export declare class ShellyTrv extends ShellyDevice implements iHeater, iBattery
     /** @inheritDoc */
     get iTemperature(): number;
     /** @inheritDoc */
+    get sTemperature(): string;
+    /** @inheritDoc */
     get roomTemperature(): number;
+    /** @inheritDoc */
+    get windowOpen(): boolean;
     private set roomTemperatur(value);
     /** @inheritDoc */
+    addTempChangeCallback(pCallback: (action: TemperatureSensorChangeAction) => void): void;
+    /** @inheritDoc */
     checkAutomaticChange(): void;
     /** @inheritDoc */
     onTemperaturChange(newTemperatur: number): void;
@@ -61,6 +70,8 @@ export declare class ShellyTrv extends ShellyDevice implements iHeater, iBattery
     dispose(): void;
     protected getNextPidLevel(): number;
     private checkSeasonTurnOff;
+    onHandleChange(_action: HandleChangeAction): void;
+    private onWindowOpenChange;
     private recalcLevel;
     private setMode;
     private setExternalTemperature;

package/lib/server/devices/shelly/shellyTrv.js

@@ -17,6 +17,8 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         /** @inheritDoc */
         this.settings = new models_1.HeaterSettings();
         /** @inheritDoc */
+        this.temperatureSensor = new sharedFunctions_1.TemperatureSensor(this);
+        /** @inheritDoc */
         this.persistHeaterInterval = services_1.Utils.guardedInterval(() => {
             this.persistHeater();
         }, 5 * 60 * 1000, this, false);
@@ -28,7 +30,6 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         this._level = 0;
         this._minimumValveLevel = 0;
         this._recalcTimeout = null;
-        this._temperatur = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this._targetTempVal = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this._desiredTemperatur = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this._useExternalTemperatureEnabled = false;
@@ -42,12 +43,15 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
             Ki: 1000, // PID: Ki in 1/1000
             Kd: 9, // PID: Kd in 1/1000
         });
+        this._windowOpen = false;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.heater);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.temperatureSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this._setAutomaticModeId = `${this.info.fullID}.tmp.automaticTemperatureControl`;
         this._setExternalTempId = `${this.info.fullID}.ext.temperature`;
         this._setEnableExternalTempId = `${this.info.fullID}.ext.enabled`;
         this._setPointTemperaturID = `${this.info.fullID}.tmp.temperatureTargetC`;
+        this._setWindowOpenID = `${this.info.fullID}.ext.openWindow`;
         this._minumumLevelId = `${this.info.fullID}.tmp.minimumValvePosition`;
         this._valvePosId = `${this.info.fullID}.tmp.valvePosition`;
         this._iAutomaticInterval = services_1.Utils.guardedInterval(this.checkAutomaticChange, 300000, this); // Alle 5 Minuten prüfen
@@ -98,19 +102,27 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
     }
     /** @inheritDoc */
     get iTemperature() {
-        if (this.settings.useOwnTemperatur) {
-            return this._temperatur;
+        if (this.settings.useOwnTemperatureForRoomTemperature) {
+            return this.temperatureSensor.temperature;
         }
         else {
             return this._roomTemperature;
         }
     }
     /** @inheritDoc */
+    get sTemperature() {
+        return `${this.iTemperature}°C`;
+    }
+    /** @inheritDoc */
     get roomTemperature() {
-        return this._roomTemperature;
+        return this.temperatureSensor.roomTemperature;
+    }
+    /** @inheritDoc */
+    get windowOpen() {
+        return this._windowOpen;
     }
     set roomTemperatur(val) {
-        this._roomTemperature = val;
+        this.temperatureSensor.roomTemperature = val;
         if (this.settings.useOwnTemperatur) {
             return;
         }
@@ -120,6 +132,10 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         }
     }
     /** @inheritDoc */
+    addTempChangeCallback(pCallback) {
+        this.temperatureSensor.addTempChangeCallback(pCallback);
+    }
+    /** @inheritDoc */
     checkAutomaticChange() {
         var _a;
         if (!this._initialSeasonCheckDone) {
@@ -177,7 +193,7 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
             this._minimumValveLevel = state.val;
         }
         else if (idSplit[3] === 'tmp' && idSplit[4] === 'temperatureC') {
-            this._temperatur = state.val;
+            this.temperatureSensor.temperature = state.val;
         }
         else if (idSplit[3] === 'tmp' && idSplit[4] === 'automaticTemperatureControl') {
             this._automaticMode = state.val;
@@ -225,6 +241,24 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         }
         this._initialSeasonCheckDone = true;
     }
+    onHandleChange(_action) {
+        var _a;
+        if (this.room.WindowGroup === undefined) {
+            return;
+        }
+        const newState = (_a = this.room.WindowGroup) === null || _a === void 0 ? void 0 : _a.anyWindowOpen;
+        if (newState === this._windowOpen) {
+            return;
+        }
+        this._windowOpen = newState;
+        this.onWindowOpenChange(this._windowOpen);
+    }
+    onWindowOpenChange(pValue) {
+        if (!this._setWindowOpenID) {
+            return;
+        }
+        this.setState(this._setWindowOpenID, pValue);
+    }
     recalcLevel() {
         if (this.settings.useOwnTemperatur || this.seasonTurnOff || !this.settings.controlByPid) {
             return;

package/lib/server/devices/zigbee/BaseDevices/zigbeeHeater.d.ts

@@ -1,31 +1,36 @@
 import { ZigbeeDevice } from './zigbeeDevice';
 import { iBatteryDevice, iHeater } from '../../baseDeviceInterfaces';
-import { HeaterSettings } from '../../../../models';
+import { HandleChangeAction, HeaterSettings, TemperatureSensorChangeAction } from '../../../../models';
 import { DeviceType } from '../../deviceType';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { PIDController } from '../../../../liquid-pid';
-import { Battery } from '../../sharedFunctions';
+import { Battery, TemperatureSensor } from '../../sharedFunctions';
 export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater, iBatteryDevice {
     /** @inheritDoc */
     readonly battery: Battery;
     /** @inheritDoc */
     readonly persistHeaterInterval: NodeJS.Timeout;
     /** @inheritDoc */
+    temperatureSensor: TemperatureSensor;
+    /** @inheritDoc */
     settings: HeaterSettings;
     protected _battery: number;
     protected _iAutomaticInterval: NodeJS.Timeout | undefined;
     protected _initialSeasonCheckDone: boolean;
     protected _level: number;
     protected _setPointTemperaturID: string;
+    protected _setWindowOpenID: string;
     protected _temperatur: number;
     protected _desiredTemperatur: number;
     protected _pidController: PIDController;
     protected _seasonTurnOff: boolean;
-    protected _roomTemperature: number;
+    protected _windowOpen: boolean;
     constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
     /** @inheritDoc */
     get batteryLevel(): number;
     /** @inheritDoc */
+    get windowOpen(): boolean;
+    /** @inheritDoc */
     get seasonTurnOff(): boolean;
     /** @inheritDoc */
     set seasonTurnOff(value: boolean);
@@ -36,14 +41,18 @@ export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater, iBatt
     get sLevel(): string;
     /** @inheritDoc */
     get iLevel(): number;
-    get sTemperatur(): string;
     /** @inheritDoc */
     get iTemperature(): number;
     /** @inheritDoc */
+    get sTemperature(): string;
+    /** @inheritDoc */
     get roomTemperature(): number;
-    protected set roomTemperatur(val: number);
+    protected set roomTemperature(val: number);
+    /** @inheritDoc */
+    addTempChangeCallback(pCallback: (action: TemperatureSensorChangeAction) => void): void;
     /** @inheritDoc */
     checkAutomaticChange(): void;
+    onHandleChange(_action: HandleChangeAction): void;
     /** @inheritDoc */
     onTemperaturChange(newTemperatur: number): void;
     persistHeater(): void;
@@ -53,4 +62,5 @@ export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater, iBatt
     dispose(): void;
     protected getNextPidLevel(): number;
     private checkSeasonTurnOff;
+    private onWindowOpenChange;
 }

package/lib/server/devices/zigbee/BaseDevices/zigbeeHeater.js

@@ -18,11 +18,14 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
             this.persistHeater();
         }, 5 * 60 * 1000, this, false);
         /** @inheritDoc */
+        this.temperatureSensor = new sharedFunctions_1.TemperatureSensor(this);
+        /** @inheritDoc */
         this.settings = new models_1.HeaterSettings();
         this._battery = -99;
         this._initialSeasonCheckDone = false;
         this._level = 0;
         this._setPointTemperaturID = '';
+        this._setWindowOpenID = '';
         this._temperatur = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this._desiredTemperatur = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this._pidController = new liquid_pid_1.PIDController({
@@ -36,8 +39,9 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
             Kd: 9, // PID: Kd in 1/1000
         });
         this._seasonTurnOff = false;
-        this._roomTemperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
+        this._windowOpen = false;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.heater);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.temperatureSensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         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, () => {
@@ -49,6 +53,10 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         return this.battery.level;
     }
     /** @inheritDoc */
+    get windowOpen() {
+        return this._windowOpen;
+    }
+    /** @inheritDoc */
     get seasonTurnOff() {
         return this._seasonTurnOff;
     }
@@ -76,24 +84,29 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
     get iLevel() {
         return this._level;
     }
-    get sTemperatur() {
-        return `${this.iTemperature}°C`;
-    }
     /** @inheritDoc */
     get iTemperature() {
-        if (this.settings.useOwnTemperatur) {
-            return this._temperatur;
+        if (this.settings.useOwnTemperatureForRoomTemperature) {
+            return this.temperatureSensor.temperature;
         }
         else {
-            return this._roomTemperature;
+            return this.roomTemperature;
         }
     }
     /** @inheritDoc */
+    get sTemperature() {
+        return `${this.iTemperature}°C`;
+    }
+    /** @inheritDoc */
     get roomTemperature() {
-        return this._roomTemperature;
+        return this.temperatureSensor.roomTemperature;
     }
-    set roomTemperatur(val) {
-        this._roomTemperature = val;
+    set roomTemperature(val) {
+        this.temperatureSensor.roomTemperature = val;
+    }
+    /** @inheritDoc */
+    addTempChangeCallback(pCallback) {
+        this.temperatureSensor.addTempChangeCallback(pCallback);
     }
     /** @inheritDoc */
     checkAutomaticChange() {
@@ -119,9 +132,21 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
             this.desiredTemperature = targetTemperature;
         }
     }
+    onHandleChange(_action) {
+        var _a;
+        if (this.room.WindowGroup === undefined) {
+            return;
+        }
+        const newState = (_a = this.room.WindowGroup) === null || _a === void 0 ? void 0 : _a.anyWindowOpen;
+        if (newState === this._windowOpen) {
+            return;
+        }
+        this._windowOpen = newState;
+        this.onWindowOpenChange(this._windowOpen);
+    }
     /** @inheritDoc */
     onTemperaturChange(newTemperatur) {
-        this.roomTemperatur = newTemperatur;
+        this.roomTemperature = newTemperatur;
     }
     persistHeater() {
         var _a;
@@ -151,12 +176,12 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         super.dispose();
     }
     getNextPidLevel() {
-        if (this.seasonTurnOff || this._roomTemperature < 0) {
+        if (this.seasonTurnOff || this.roomTemperature < 0) {
             return 0;
         }
         this._pidController.setPoint(this.desiredTemperature);
-        const newValue = this._pidController.calculate(this._roomTemperature);
-        this.log(models_1.LogLevel.Debug, `New PID Value ${newValue}% (cTemp: ${this._roomTemperature}, dTemp: ${this.desiredTemperature})`);
+        const newValue = this._pidController.calculate(this.roomTemperature);
+        this.log(models_1.LogLevel.Debug, `New PID Value ${newValue}% (cTemp: ${this.roomTemperature}, dTemp: ${this.desiredTemperature})`);
         return newValue;
     }
     checkSeasonTurnOff() {
@@ -167,5 +192,11 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         }
         this._initialSeasonCheckDone = true;
     }
+    onWindowOpenChange(pValue) {
+        if (!this._setWindowOpenID) {
+            return;
+        }
+        this.setState(this._setWindowOpenID, pValue);
+    }
 }
 exports.ZigbeeHeater = ZigbeeHeater;

package/lib/server/devices/zigbee/BaseDevices/zigbeeWindowHandle.d.ts

@@ -5,6 +5,7 @@ import { DeviceType } from '../../deviceType';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { WindowPosition } from '../../models';
 import { Window } from '../../groups';
+import { HandleChangeAction } from '../../../../models';
 import { HandleSettings } from '../../../../models/deviceSettings/handleSettings';
 export declare class ZigbeeWindowHandle extends ZigbeeDevice implements iHandleSensor, iBatteryDevice {
     /** @inheritDoc */
@@ -31,6 +32,8 @@ export declare class ZigbeeWindowHandle extends ZigbeeDevice implements iHandleS
     /** @inheritDoc */
     addClosedCallback(pCallback: (pValue: boolean) => void): void;
     /** @inheritDoc */
+    addHandleChangeCallback(cb: (handleChangeAction: HandleChangeAction) => void): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
     private toWindowPosition;
 }

package/lib/server/devices/zigbee/BaseDevices/zigbeeWindowHandle.js

@@ -52,6 +52,10 @@ class ZigbeeWindowHandle extends index_1.ZigbeeDevice {
         this.handleSensor.addClosedCallback(pCallback);
     }
     /** @inheritDoc */
+    addHandleChangeCallback(cb) {
+        this.handleSensor.addHandleChangeCallback(cb);
+    }
+    /** @inheritDoc */
     update(idSplit, state, initial = false, pOverride = false) {
         super.update(idSplit, state, initial, pOverride);
         switch (idSplit[3]) {

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

@@ -25,3 +25,4 @@ export * from './zigbeeTuyaValve';
 export * from './zigbeeUbisysActuator';
 export * from './zigbeeUbisysLampe';
 export * from './zigbeeUbisysShutter';
+export { ZigbeeTuyaMotion } from './zigbeeTuyaMotion';