hoffmation-base 2.18.11 → 2.18.13

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

@@ -23,13 +23,11 @@ export declare class ShellyTrv extends ShellyDevice implements iHeater {
     private _useExternalTemperatureEnabled;
     private _pidController;
     private _lastBatteryPersist;
-    private readonly _batteryId;
     private readonly _minumumLevelId;
     private readonly _setAutomaticModeId;
     private readonly _setExternalTempId;
     private readonly _setEnableExternalTempId;
     private readonly _setPointTemperaturID;
-    private readonly _temperatureId;
     private readonly _valvePosId;
     constructor(pInfo: IoBrokerDeviceInfo);
     protected _seasonTurnOff: boolean;

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

@@ -51,13 +51,11 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         this._roomTemperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.heater);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
-        this._batteryId = `${this.info.fullID}.bat.value`;
         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._minumumLevelId = `${this.info.fullID}.tmp.minimumValvePosition`;
-        this._temperatureId = `${this.info.fullID}.tmp.temperatureC`;
         this._valvePosId = `${this.info.fullID}.tmp.valvePosition`;
         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, () => {
@@ -124,7 +122,7 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         }
     }
     checkAutomaticChange() {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b;
         if (!this._initialSeasonCheckDone) {
             this.checkSeasonTurnOff();
         }
@@ -137,7 +135,12 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         if (!this.settings.useOwnTemperatur && !this.settings.controlByPid) {
             this.setExternalTemperatureEnabled(true);
         }
-        const heatGroupSettings = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup) === null || _b === void 0 ? void 0 : _b.settings;
+        const heatGroup = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup;
+        if (heatGroup === undefined) {
+            this.log(models_1.LogLevel.Warn, `HeatGroup is undefined for ${this.info.customName}`);
+            return;
+        }
+        const heatGroupSettings = heatGroup.settings;
         if ((heatGroupSettings === null || heatGroupSettings === void 0 ? void 0 : heatGroupSettings.automaticMode) == false) {
             this.desiredTemperature = heatGroupSettings.manualTemperature;
             return;
@@ -145,8 +148,7 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         if (!this.settings.automaticMode) {
             return;
         }
-        const setting = models_1.TemperatureSettings.getActiveSetting((_f = (_e = (_d = (_c = this.room) === null || _c === void 0 ? void 0 : _c.HeatGroup) === null || _d === void 0 ? void 0 : _d.settings) === null || _e === void 0 ? void 0 : _e.automaticPoints) !== null && _f !== void 0 ? _f : [], new Date());
-        const targetTemperature = (_h = (_g = setting === null || setting === void 0 ? void 0 : setting.temperature) !== null && _g !== void 0 ? _g : heatGroupSettings === null || heatGroupSettings === void 0 ? void 0 : heatGroupSettings.automaticFallBackTemperatur) !== null && _h !== void 0 ? _h : 20;
+        const targetTemperature = (_b = heatGroup.desiredTemp) !== null && _b !== void 0 ? _b : 20;
         if (this._desiredTemperatur !== targetTemperature) {
             this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${targetTemperature}°C`);
             this.desiredTemperature = targetTemperature;
@@ -166,38 +168,35 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistHeater(this);
     }
     update(idSplit, state, initial = false) {
-        const fullId = idSplit.join('.');
-        switch (fullId) {
-            case this._valvePosId:
-                this.log(models_1.LogLevel.Trace, `Valve position update for ${this.info.customName} to "${state.val}"`);
-                this._level = state.val / 100;
-                break;
-            case this._setEnableExternalTempId:
-                this._useExternalTemperatureEnabled = state.val;
-                break;
-            case this._minumumLevelId:
-                this._minimumValveLevel = state.val;
-                break;
-            case this._temperatureId:
-                this._temperatur = state.val;
-                break;
-            case this._setAutomaticModeId:
-                this._automaticMode = state.val;
-                const desiredMode = !this.settings.controlByPid;
-                if (this._automaticMode !== desiredMode) {
-                    this.setMode(desiredMode);
-                }
-                break;
-            case this._setPointTemperaturID:
-                this._targetTempVal = state.val;
-                break;
-            case this._batteryId:
-                this._battery = state.val;
-                this.persistBatteryDevice();
-                if (this._battery < 20) {
-                    this.log(models_1.LogLevel.Warn, `Das Shelly Gerät hat unter 20% Batterie.`);
-                }
-                break;
+        if (idSplit[3] === 'tmp' && idSplit[4] === 'valvePosition') {
+            this.log(models_1.LogLevel.Trace, `Valve position update for ${this.info.customName} to "${state.val}"`);
+            this._level = state.val / 100;
+        }
+        else if (idSplit[3] === 'ext' && idSplit[4] === 'enabled') {
+            this._useExternalTemperatureEnabled = state.val;
+        }
+        else if (idSplit[3] === 'tmp' && idSplit[4] === 'minimumValvePosition') {
+            this._minimumValveLevel = state.val;
+        }
+        else if (idSplit[3] === 'tmp' && idSplit[4] === 'temperatureC') {
+            this._temperatur = state.val;
+        }
+        else if (idSplit[3] === 'tmp' && idSplit[4] === 'automaticTemperatureControl') {
+            this._automaticMode = state.val;
+            const desiredMode = !this.settings.controlByPid;
+            if (this._automaticMode !== desiredMode) {
+                this.setMode(desiredMode);
+            }
+        }
+        else if (idSplit[3] === 'tmp' && idSplit[4] === 'temperatureTargetC') {
+            this._targetTempVal = state.val;
+        }
+        else if (idSplit[3] === 'bat' && idSplit[4] === 'value') {
+            this._battery = state.val;
+            this.persistBatteryDevice();
+            if (this._battery < 20) {
+                this.log(models_1.LogLevel.Warn, `Das Shelly Gerät hat unter 20% Batterie.`);
+            }
         }
         super.update(idSplit, state, initial, true);
     }