hoffmation-base 2.16.0 → 2.16.1

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

@@ -9,6 +9,8 @@ export declare class IoBrokerDeviceInfo extends DeviceInfo {
     channel?: number;
     valueName?: string;
     devConf: deviceConfig;
+    static idSplitter(id: string): string[];
+    private static replaceInvalidIdChars;
     /**
      * Extracts the relevant infos from the passed deviceConfig and combines them in a new Info object
      * @param {deviceConfig} pDevConf The device Config based on the extracted devices.json from ioBroker

package/lib/server/devices/IoBrokerDeviceInfo.js

@@ -7,6 +7,16 @@ exports.IoBrokerDeviceInfo = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const DeviceInfo_1 = require("./DeviceInfo");
 class IoBrokerDeviceInfo extends DeviceInfo_1.DeviceInfo {
+    static idSplitter(id) {
+        const split = id.split('.');
+        if (split[2] !== undefined) {
+            split[2] = this.replaceInvalidIdChars(split[2]);
+        }
+        return split;
+    }
+    static replaceInvalidIdChars(idPart) {
+        return idPart.replace(/[#\-]/g, '_');
+    }
     /**
      * Extracts the relevant infos from the passed deviceConfig and combines them in a new Info object
      * @param {deviceConfig} pDevConf The device Config based on the extracted devices.json from ioBroker
@@ -17,7 +27,7 @@ class IoBrokerDeviceInfo extends DeviceInfo_1.DeviceInfo {
         super();
         this.devConf = pDevConf;
         this.type = pDevConf.type;
-        const idSplit = pDevConf._id.split('.');
+        const idSplit = IoBrokerDeviceInfo.idSplitter(pDevConf._id);
         this.fullID = pDevConf._id;
         this.devID = idSplit[2];
         this.fullName = pDevConf.common.name;

package/lib/server/devices/deviceUpdater.js

@@ -5,12 +5,13 @@ const services_1 = require("../services");
 const models_1 = require("../../models");
 const devices_1 = require("./devices");
 const mqtt_1 = require("./mqtt");
+const IoBrokerDeviceInfo_1 = require("./IoBrokerDeviceInfo");
 class DeviceUpdater {
     constructor(pDevices) {
         this.devices = pDevices;
     }
     updateObject(pId, pObj) {
-        const idSplit = pId.split('.');
+        const idSplit = IoBrokerDeviceInfo_1.IoBrokerDeviceInfo.idSplitter(pId);
         if (idSplit.length < 2)
             return;
         if (idSplit[0] === devices_1.Devices.IDENTIFIER_HOMEMATIC) {
@@ -23,7 +24,7 @@ class DeviceUpdater {
             // Ignore null states
             return;
         }
-        const idSplit = id.split('.');
+        const idSplit = IoBrokerDeviceInfo_1.IoBrokerDeviceInfo.idSplitter(id);
         if (idSplit.length < 2)
             return;
         if (idSplit[0] == 'mqtt') {

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

@@ -47,7 +47,7 @@ export declare class ShellyTrv extends ShellyDevice implements iHeater {
     stopAutomaticCheck(): void;
     onTemperaturChange(newTemperatur: number): void;
     persistHeater(): void;
-    update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
+    update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     protected getNextPidLevel(): number;
     private checkSeasonTurnOff;
     persistBatteryDevice(): void;

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

@@ -123,13 +123,20 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         if (!this._initialSeasonCheckDone) {
             this.checkSeasonTurnOff();
         }
-        const heatGroupSettings = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup) === null || _b === void 0 ? void 0 : _b.settings;
-        if (!this.settings.automaticMode || this.seasonTurnOff || (heatGroupSettings === null || heatGroupSettings === void 0 ? void 0 : heatGroupSettings.automaticMode) === false) {
+        if (this.seasonTurnOff) {
             return;
         }
         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;
+        if ((heatGroupSettings === null || heatGroupSettings === void 0 ? void 0 : heatGroupSettings.automaticMode) == false) {
+            this.desiredTemperature = heatGroupSettings.manualTemperature;
+            return;
+        }
+        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());
         if (setting === undefined) {
             this.log(models_1.LogLevel.Warn, `Undefined Heating Timestamp.`);
@@ -154,7 +161,7 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistHeater(this);
     }
-    update(idSplit, state, initial = false, pOverride = false) {
+    update(idSplit, state, initial = false) {
         const fullId = idSplit.join('.');
         switch (fullId) {
             case this._valvePosId:
@@ -185,7 +192,7 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
                 }
                 break;
         }
-        super.update(idSplit, state, initial, pOverride);
+        super.update(idSplit, state, initial, true);
     }
     getNextPidLevel() {
         if (this.seasonTurnOff || this._roomTemperature < 0) {