hoffmation-base 3.0.0-alpha.89 → 3.0.0-alpha.90

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

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HumiditySensor = void 0;
+const services_1 = require("../../services");
+const models_1 = require("../../../models");
+const baseDeviceInterfaces_1 = require("../baseDeviceInterfaces");
+class HumiditySensor {
+    constructor(_device) {
+        this._device = _device;
+        /** @inheritDoc */
+        this.jsonOmitKeys = ['_device'];
+        this._humidityCallbacks = [];
+        this._humidity = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
+        this._persistHumiditySensorInterval = services_1.Utils.guardedInterval(() => {
+            this.persist();
+        }, 5 * 60 * 1000, this, false);
+    }
+    get humidity() {
+        return this._humidity;
+    }
+    set humidity(val) {
+        this._humidity = val;
+        for (const cb of this._humidityCallbacks) {
+            cb(new models_1.HumiditySensorChangeAction(this._device, val));
+        }
+    }
+    dispose() {
+        if (this._persistHumiditySensorInterval) {
+            clearInterval(this._persistHumiditySensorInterval);
+        }
+    }
+    persist() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistHumiditySensor(this._device);
+    }
+    addHumidityCallback(pCallback) {
+        this._humidityCallbacks.push(pCallback);
+        if (this._humidity > 0) {
+            pCallback(new models_1.HumiditySensorChangeAction(this._device, this._humidity));
+        }
+    }
+    toJSON() {
+        return services_1.Utils.jsonFilter(this, this.jsonOmitKeys);
+    }
+}
+exports.HumiditySensor = HumiditySensor;

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

@@ -1 +1,5 @@
+export * from './battery';
+export * from './handleSensor';
+export * from './humiditySensor';
 export * from './lampUtils';
+export * from './temperatureSensor';

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

@@ -14,4 +14,8 @@ 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("./battery"), exports);
+__exportStar(require("./handleSensor"), exports);
+__exportStar(require("./humiditySensor"), exports);
 __exportStar(require("./lampUtils"), exports);
+__exportStar(require("./temperatureSensor"), exports);

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

@@ -0,0 +1,31 @@
+import { TemperatureSensorChangeAction } from '../../../models';
+import { iTemperatureSensor } from '../baseDeviceInterfaces';
+import { iJsonOmitKeys } from '../../../models/iJsonOmitKeys';
+export declare class TemperatureSensor implements iJsonOmitKeys {
+    private readonly _device;
+    /** @inheritDoc */
+    readonly jsonOmitKeys: string[];
+    /**
+     * The current room temperature as a number in Celsius
+     */
+    roomTemperature: number;
+    /**
+     * The interval to persist the temperature sensor information
+     */
+    private readonly _persistTemperatureSensorInterval;
+    private _temperature;
+    private _temperaturCallbacks;
+    constructor(_device: iTemperatureSensor);
+    set temperature(val: number);
+    /**
+     * Persists the current temperature sensor information to the database
+     */
+    persist(): void;
+    /**
+     * Adds a callback to be called when the temperature changes
+     * @param pCallback - The callback to be called
+     */
+    addTempChangeCallback(pCallback: (action: TemperatureSensorChangeAction) => void): void;
+    dispose(): void;
+    toJSON(): Partial<TemperatureSensor>;
+}

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

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TemperatureSensor = void 0;
+const services_1 = require("../../services");
+const models_1 = require("../../../models");
+const baseDeviceInterfaces_1 = require("../baseDeviceInterfaces");
+class TemperatureSensor {
+    constructor(_device) {
+        this._device = _device;
+        /** @inheritDoc */
+        this.jsonOmitKeys = ['_device'];
+        /**
+         * The current room temperature as a number in Celsius
+         */
+        this.roomTemperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
+        /**
+         * The interval to persist the temperature sensor information
+         */
+        this._persistTemperatureSensorInterval = services_1.Utils.guardedInterval(() => {
+            this.persist();
+        }, 5 * 60 * 1000, this, false);
+        this._temperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
+        this._temperaturCallbacks = [];
+    }
+    set temperature(val) {
+        this._temperature = val;
+        for (const cb of this._temperaturCallbacks) {
+            cb(new models_1.TemperatureSensorChangeAction(this._device, val));
+        }
+    }
+    /**
+     * Persists the current temperature sensor information to the database
+     */
+    persist() {
+        var _a;
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistTemperatureSensor(this._device);
+    }
+    /**
+     * Adds a callback to be called when the temperature changes
+     * @param pCallback - The callback to be called
+     */
+    addTempChangeCallback(pCallback) {
+        this._temperaturCallbacks.push(pCallback);
+        if (this._temperature > baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
+            pCallback(new models_1.TemperatureSensorChangeAction(this._device, this._temperature));
+        }
+    }
+    dispose() {
+        if (this._persistTemperatureSensorInterval) {
+            clearInterval(this._persistTemperatureSensorInterval);
+        }
+    }
+    toJSON() {
+        return services_1.Utils.jsonFilter(this, this.jsonOmitKeys);
+    }
+}
+exports.TemperatureSensor = TemperatureSensor;

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

@@ -1,8 +1,11 @@
 import { ShellyDevice } from './shellyDevice';
 import { iBatteryDevice, iHeater } from '../baseDeviceInterfaces';
-import { BatteryLevelChangeAction, HeaterSettings } from '../../../models';
+import { HeaterSettings } from '../../../models';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
+import { Battery } from '../sharedFunctions';
 export declare class ShellyTrv extends ShellyDevice implements iHeater, iBatteryDevice {
+    /** @inheritDoc */
+    readonly battery: Battery;
     /** @inheritDoc */
     settings: HeaterSettings;
     /** @inheritDoc */
@@ -10,7 +13,6 @@ export declare class ShellyTrv extends ShellyDevice implements iHeater, iBattery
     protected _seasonTurnOff: boolean;
     protected _roomTemperature: number;
     private _automaticMode;
-    private _battery;
     private _iAutomaticInterval;
     private _initialSeasonCheckDone;
     private _lastRecalc;
@@ -22,20 +24,15 @@ export declare class ShellyTrv extends ShellyDevice implements iHeater, iBattery
     private _desiredTemperatur;
     private _useExternalTemperatureEnabled;
     private _pidController;
-    private _lastBatteryPersist;
     private readonly _minumumLevelId;
     private readonly _setAutomaticModeId;
     private readonly _setExternalTempId;
     private readonly _setEnableExternalTempId;
     private readonly _setPointTemperaturID;
     private readonly _valvePosId;
-    private _lastBatteryLevel;
-    private _batteryLevelCallbacks;
     constructor(pInfo: IoBrokerDeviceInfo);
     /** @inheritDoc */
-    get lastBatteryPersist(): number;
-    /** @inheritDoc */
-    get battery(): number;
+    get batteryLevel(): number;
     get minimumLevel(): number;
     /** @inheritDoc */
     get seasonTurnOff(): boolean;
@@ -53,8 +50,6 @@ export declare class ShellyTrv extends ShellyDevice implements iHeater, iBattery
     get roomTemperature(): number;
     private set roomTemperatur(value);
     /** @inheritDoc */
-    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
-    /** @inheritDoc */
     checkAutomaticChange(): void;
     /** @inheritDoc */
     onTemperaturChange(newTemperatur: number): void;
@@ -63,8 +58,6 @@ export declare class ShellyTrv extends ShellyDevice implements iHeater, iBattery
     /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     /** @inheritDoc */
-    persistBatteryDevice(): void;
-    /** @inheritDoc */
     dispose(): void;
     protected getNextPidLevel(): number;
     private checkSeasonTurnOff;
@@ -74,8 +67,4 @@ export declare class ShellyTrv extends ShellyDevice implements iHeater, iBattery
     private setExternalTemperatureEnabled;
     private setValve;
     private setMinimumLevel;
-    /**
-     * Checks whether the battery level did change and if so fires the callbacks
-     */
-    private checkForBatteryChange;
 }

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

@@ -8,10 +8,13 @@ const models_1 = require("../../../models");
 const liquid_pid_1 = require("../../../liquid-pid");
 const deviceType_1 = require("../deviceType");
 const DeviceCapability_1 = require("../DeviceCapability");
+const sharedFunctions_1 = require("../sharedFunctions");
 class ShellyTrv extends shellyDevice_1.ShellyDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ShellyTrv);
         /** @inheritDoc */
+        this.battery = new sharedFunctions_1.Battery(this);
+        /** @inheritDoc */
         this.settings = new models_1.HeaterSettings();
         /** @inheritDoc */
         this.persistHeaterInterval = services_1.Utils.guardedInterval(() => {
@@ -20,7 +23,6 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         this._seasonTurnOff = false;
         this._roomTemperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this._automaticMode = false;
-        this._battery = -99;
         this._initialSeasonCheckDone = false;
         this._lastRecalc = 0;
         this._level = 0;
@@ -40,9 +42,6 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
             Ki: 1000, // PID: Ki in 1/1000
             Kd: 9, // PID: Kd in 1/1000
         });
-        this._lastBatteryPersist = 0;
-        this._lastBatteryLevel = -1;
-        this._batteryLevelCallbacks = [];
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.heater);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this._setAutomaticModeId = `${this.info.fullID}.tmp.automaticTemperatureControl`;
@@ -57,12 +56,8 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         }, 0, 2, 0));
     }
     /** @inheritDoc */
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    /** @inheritDoc */
-    get battery() {
-        return this._battery;
+    get batteryLevel() {
+        return this.battery.level;
     }
     get minimumLevel() {
         return this._minimumValveLevel;
@@ -125,10 +120,6 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         }
     }
     /** @inheritDoc */
-    addBatteryLevelCallback(pCallback) {
-        this._batteryLevelCallbacks.push(pCallback);
-    }
-    /** @inheritDoc */
     checkAutomaticChange() {
         var _a;
         if (!this._initialSeasonCheckDone) {
@@ -199,26 +190,14 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
             this._targetTempVal = state.val;
         }
         else if (idSplit[3] === 'bat' && idSplit[4] === 'value') {
-            this._battery = state.val;
-            this.checkForBatteryChange();
-            this.persistBatteryDevice();
-            if (this._battery < 20) {
+            this.battery.level = state.val;
+            if (this.batteryLevel < 20) {
                 this.log(models_1.LogLevel.Warn, 'Das Shelly Gerät hat unter 20% Batterie.');
             }
         }
         super.update(idSplit, state, initial, true);
     }
     /** @inheritDoc */
-    persistBatteryDevice() {
-        var _a;
-        const now = services_1.Utils.nowMS();
-        if (this._lastBatteryPersist + 60000 > now) {
-            return;
-        }
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
-        this._lastBatteryPersist = now;
-    }
-    /** @inheritDoc */
     dispose() {
         if (this.persistHeaterInterval) {
             clearInterval(this.persistHeaterInterval);
@@ -282,18 +261,5 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
     setMinimumLevel(pidForcedMinimum) {
         this.setState(this._minumumLevelId, pidForcedMinimum);
     }
-    /**
-     * Checks whether the battery level did change and if so fires the callbacks
-     */
-    checkForBatteryChange() {
-        const newLevel = this.battery;
-        if (newLevel == -1 || newLevel == this._lastBatteryLevel) {
-            return;
-        }
-        for (const cb of this._batteryLevelCallbacks) {
-            cb(new models_1.BatteryLevelChangeAction(this));
-        }
-        this._lastBatteryLevel = newLevel;
-    }
 }
 exports.ShellyTrv = ShellyTrv;

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

@@ -2,32 +2,20 @@ import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
 import { iDisposable } from '../../services';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { DeviceType } from '../deviceType';
-import { BatteryLevelChangeAction } from '../../../models';
 import { iBatteryDevice } from '../baseDeviceInterfaces';
+import { Battery } from '../sharedFunctions';
 export declare class SmartGardenDevice extends IoBrokerBaseDevice implements iDisposable, iBatteryDevice {
+    /** @inheritDoc */
+    readonly battery: Battery;
     protected _criticalBatteryLevel: number;
     protected readonly _deviceSerial: string;
     private _lastUpdate;
-    private _lastBatteryLevel;
-    private _batteryLevelCallbacks;
-    private _lastBatteryPersist;
-    private _battery;
     constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
     /** @inheritDoc */
-    get lastBatteryPersist(): number;
-    /** @inheritDoc */
-    get battery(): number;
+    get batteryLevel(): number;
     get lastUpdate(): Date;
     /** @inheritDoc */
-    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
-    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
     /** @inheritDoc */
-    persistBatteryDevice(): void;
-    /** @inheritDoc */
     dispose(): void;
-    /**
-     * Checks whether the battery level did change and if so fires the callbacks
-     */
-    private checkForBatteryChange;
 }

package/lib/server/devices/smartGarden/smartGardenDevice.js

@@ -2,37 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SmartGardenDevice = void 0;
 const IoBrokerBaseDevice_1 = require("../IoBrokerBaseDevice");
-const services_1 = require("../../services");
 const models_1 = require("../../../models");
 const DeviceCapability_1 = require("../DeviceCapability");
+const sharedFunctions_1 = require("../sharedFunctions");
 class SmartGardenDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     constructor(pInfo, pType) {
         super(pInfo, pType);
+        /** @inheritDoc */
+        this.battery = new sharedFunctions_1.Battery(this);
         this._criticalBatteryLevel = 20;
         this._lastUpdate = new Date(0);
-        this._lastBatteryLevel = -1;
-        this._batteryLevelCallbacks = [];
-        this._lastBatteryPersist = 0;
-        this._battery = -99;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this._deviceSerial = pInfo.devID.replace('DEVICE_', '');
     }
     /** @inheritDoc */
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    /** @inheritDoc */
-    get battery() {
-        return this._battery;
+    get batteryLevel() {
+        return this.battery.level;
     }
     get lastUpdate() {
         return this._lastUpdate;
     }
     /** @inheritDoc */
-    addBatteryLevelCallback(pCallback) {
-        this._batteryLevelCallbacks.push(pCallback);
-    }
-    /** @inheritDoc */
     update(idSplit, state, initial = false, pOverride = false) {
         this.log(models_1.LogLevel.DeepTrace, `Smartgarden: ${initial ? 'Initiales ' : ''}Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         if (!pOverride) {
@@ -50,10 +40,8 @@ class SmartGardenDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         if (folder.indexOf('SERVICE_COMMON') === 0) {
             switch (stateName) {
                 case 'batteryLevel_value':
-                    this._battery = state.val;
-                    this.checkForBatteryChange();
-                    this.persistBatteryDevice();
-                    if (this._battery < this._criticalBatteryLevel) {
+                    this.battery.level = state.val;
+                    if (this.batteryLevel < this._criticalBatteryLevel) {
                         this.log(models_1.LogLevel.Warn, 'This SmartGarden device reached critical battery level.');
                     }
                     break;
@@ -68,31 +56,8 @@ class SmartGardenDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         }
     }
     /** @inheritDoc */
-    persistBatteryDevice() {
-        var _a;
-        const now = services_1.Utils.nowMS();
-        if (this._lastBatteryPersist + 60000 > now) {
-            return;
-        }
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
-        this._lastBatteryPersist = now;
-    }
-    /** @inheritDoc */
     dispose() {
         // Nothing yet
     }
-    /**
-     * Checks whether the battery level did change and if so fires the callbacks
-     */
-    checkForBatteryChange() {
-        const newLevel = this.battery;
-        if (newLevel == -1 || newLevel == this._lastBatteryLevel) {
-            return;
-        }
-        for (const cb of this._batteryLevelCallbacks) {
-            cb(new models_1.BatteryLevelChangeAction(this));
-        }
-        this._lastBatteryLevel = newLevel;
-    }
 }
 exports.SmartGardenDevice = SmartGardenDevice;

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

@@ -2,16 +2,12 @@ import { iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
 import { SmartGardenDevice } from './smartGardenDevice';
 import { HumiditySensorChangeAction, TemperatureSensorChangeAction } from '../../../models';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
+import { HumiditySensor, TemperatureSensor } from '../sharedFunctions';
 export declare class SmartGardenSensor extends SmartGardenDevice implements iHumiditySensor, iTemperatureSensor {
     /** @inheritDoc */
-    readonly persistHumiditySensorInterval: NodeJS.Timeout;
+    temperatureSensor: TemperatureSensor;
     /** @inheritDoc */
-    readonly persistTemperatureSensorInterval: NodeJS.Timeout;
-    private _humidityCallbacks;
-    private _humidity;
-    private _roomTemperature;
-    private _temperature;
-    private _temperaturCallbacks;
+    humiditySensor: HumiditySensor;
     constructor(pInfo: IoBrokerDeviceInfo);
     /** @inheritDoc */
     get roomTemperature(): number;
@@ -19,12 +15,10 @@ export declare class SmartGardenSensor extends SmartGardenDevice implements iHum
     set roomTemperature(value: number);
     /** @inheritDoc */
     get humidity(): number;
-    private set humidity(value);
     /** @inheritDoc */
     get iTemperature(): number;
     /** @inheritDoc */
     get sTemperature(): string;
-    private set temperature(value);
     /** @inheritDoc */
     addHumidityCallback(pCallback: (action: HumiditySensorChangeAction) => void): void;
     /** @inheritDoc */
@@ -32,10 +26,6 @@ export declare class SmartGardenSensor extends SmartGardenDevice implements iHum
     /** @inheritDoc */
     onTemperaturChange(newTemperatur: number): void;
     /** @inheritDoc */
-    persistHumiditySensor(): void;
-    /** @inheritDoc */
-    persistTemperaturSensor(): void;
-    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     /** @inheritDoc */
     dispose(): void;

package/lib/server/devices/smartGarden/smartGardenSensor.js

@@ -1,92 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SmartGardenSensor = void 0;
-const baseDeviceInterfaces_1 = require("../baseDeviceInterfaces");
 const smartGardenDevice_1 = require("./smartGardenDevice");
-const models_1 = require("../../../models");
 const deviceType_1 = require("../deviceType");
 const DeviceCapability_1 = require("../DeviceCapability");
-const services_1 = require("../../services");
+const sharedFunctions_1 = require("../sharedFunctions");
 class SmartGardenSensor extends smartGardenDevice_1.SmartGardenDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.SmartGardenSensor);
         /** @inheritDoc */
-        this.persistHumiditySensorInterval = services_1.Utils.guardedInterval(() => {
-            this.persistHumiditySensor();
-        }, 5 * 60 * 1000, this, false);
+        this.temperatureSensor = new sharedFunctions_1.TemperatureSensor(this);
         /** @inheritDoc */
-        this.persistTemperatureSensorInterval = services_1.Utils.guardedInterval(() => {
-            this.persistTemperaturSensor();
-        }, 5 * 60 * 1000, this, false);
-        this._humidityCallbacks = [];
-        this._humidity = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
-        this._roomTemperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
-        this._temperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
-        this._temperaturCallbacks = [];
+        this.humiditySensor = new sharedFunctions_1.HumiditySensor(this);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.humiditySensor);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.temperatureSensor);
     }
     /** @inheritDoc */
     get roomTemperature() {
-        return this._roomTemperature;
+        return this.temperatureSensor.roomTemperature;
     }
     /** @inheritDoc */
     set roomTemperature(value) {
-        this._roomTemperature = value;
+        this.temperatureSensor.roomTemperature = value;
     }
     /** @inheritDoc */
     get humidity() {
-        return this._humidity;
-    }
-    set humidity(val) {
-        this._humidity = val;
-        for (const cb of this._humidityCallbacks) {
-            cb(new models_1.HumiditySensorChangeAction(this, val));
-        }
+        return this.humiditySensor.humidity;
     }
     /** @inheritDoc */
     get iTemperature() {
-        return this._temperature;
+        return this.temperatureSensor.temperature;
     }
     /** @inheritDoc */
     get sTemperature() {
-        return `${this._temperature}°C`;
-    }
-    set temperature(val) {
-        this._temperature = val;
-        for (const cb of this._temperaturCallbacks) {
-            cb(new models_1.TemperatureSensorChangeAction(this, val));
-        }
+        return `${this.temperatureSensor.temperature}°C`;
     }
     /** @inheritDoc */
     addHumidityCallback(pCallback) {
-        this._humidityCallbacks.push(pCallback);
-        if (this._humidity > 0) {
-            pCallback(new models_1.HumiditySensorChangeAction(this, this._humidity));
-        }
+        this.humiditySensor.addHumidityCallback(pCallback);
     }
     /** @inheritDoc */
     addTempChangeCallback(pCallback) {
-        this._temperaturCallbacks.push(pCallback);
-        if (this._temperature > baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
-            pCallback(new models_1.TemperatureSensorChangeAction(this, this._temperature));
-        }
+        this.temperatureSensor.addTempChangeCallback(pCallback);
     }
     /** @inheritDoc */
     onTemperaturChange(newTemperatur) {
         this.roomTemperature = newTemperatur;
     }
     /** @inheritDoc */
-    persistHumiditySensor() {
-        var _a;
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistHumiditySensor(this);
-    }
-    /** @inheritDoc */
-    persistTemperaturSensor() {
-        var _a;
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistTemperatureSensor(this);
-    }
-    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         super.update(idSplit, state, initial, true);
         if (idSplit.length < 6) {
@@ -97,22 +58,18 @@ class SmartGardenSensor extends smartGardenDevice_1.SmartGardenDevice {
         if (folder.indexOf('SERVICE_SENSOR') === 0) {
             switch (stateName) {
                 case 'soilHumidity_value':
-                    this.humidity = state.val;
+                    this.humiditySensor.humidity = state.val;
                     break;
                 case 'soilTemperature_value':
-                    this.temperature = state.val;
+                    this.temperatureSensor.temperature = state.val;
                     break;
             }
         }
     }
     /** @inheritDoc */
     dispose() {
-        if (this.persistTemperatureSensorInterval) {
-            clearInterval(this.persistTemperatureSensorInterval);
-        }
-        if (this.persistHumiditySensorInterval) {
-            clearInterval(this.persistHumiditySensorInterval);
-        }
+        this.temperatureSensor.dispose();
+        this.humiditySensor.dispose();
         super.dispose();
     }
 }

package/lib/server/devices/velux/veluxShutter.js

@@ -85,13 +85,13 @@ class VeluxShutter extends veluxDevice_1.VeluxDevice {
         }
         this.log(models_2.LogLevel.Debug, command.logMessage);
         if (this._window !== undefined) {
-            if (this._window.griffeInPosition(models_1.WindowPosition.offen) > 0 && command.level < 100) {
+            if (this._window.griffeInPosition(models_1.WindowPosition.open) > 0 && command.level < 100) {
                 if (!command.skipOpenWarning) {
                     this.log(models_2.LogLevel.Alert, 'Not closing the shutter, as the window is open!');
                 }
                 return;
             }
-            if (this._window.griffeInPosition(models_1.WindowPosition.kipp) > 0 && targetLevel < 50) {
+            if (this._window.griffeInPosition(models_1.WindowPosition.tilted) > 0 && targetLevel < 50) {
                 targetLevel = 50;
                 if (!command.skipOpenWarning) {
                     this.log(models_2.LogLevel.Alert, 'Not closing the shutter, as the window is half open!');

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

@@ -8,3 +8,4 @@ export * from './zigbeeMotionSensor';
 export * from './zigbeeShutter';
 export * from './zigbeeSwitch';
 export { ZigbeeLamp } from './zigbeeLamp';
+export { ZigbeeWindowHandle } from './zigbeeWindowHandle';

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

@@ -14,7 +14,7 @@ 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 });
-exports.ZigbeeLamp = void 0;
+exports.ZigbeeWindowHandle = exports.ZigbeeLamp = void 0;
 __exportStar(require("./ZigbeeActuator"), exports);
 __exportStar(require("./zigbeeDevice"), exports);
 __exportStar(require("./zigbeeDimmer"), exports);
@@ -26,3 +26,5 @@ __exportStar(require("./zigbeeShutter"), exports);
 __exportStar(require("./zigbeeSwitch"), exports);
 var zigbeeLamp_1 = require("./zigbeeLamp");
 Object.defineProperty(exports, "ZigbeeLamp", { enumerable: true, get: function () { return zigbeeLamp_1.ZigbeeLamp; } });
+var zigbeeWindowHandle_1 = require("./zigbeeWindowHandle");
+Object.defineProperty(exports, "ZigbeeWindowHandle", { enumerable: true, get: function () { return zigbeeWindowHandle_1.ZigbeeWindowHandle; } });