hoffmation-base 2.18.0 → 2.18.2

package/lib/server/devices/devices.js

@@ -131,7 +131,8 @@ class Devices {
     }
     static processZigbeeDevice(cDevConf) {
         const zigbeeInfo = new IoBrokerDeviceInfo_1.IoBrokerDeviceInfo(cDevConf);
-        const fullName = `${Devices.IDENTIFIER_ZIGBEE}-${zigbeeInfo.devID}`;
+        const apiDevId = zigbeeInfo.devID.startsWith('0x') ? zigbeeInfo.devID.substring(2) : zigbeeInfo.devID;
+        const fullName = `${Devices.IDENTIFIER_ZIGBEE}-${apiDevId}`;
         zigbeeInfo.allDevicesKey = fullName;
         if (typeof Devices.alLDevices[fullName] !== 'undefined') {
             return;

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

@@ -32,5 +32,4 @@ export declare class HeatGroup extends BaseGroup {
     deleteAutomaticPoint(name: string): void;
     setAutomaticPoint(setting: TemperatureSettings): void;
     private recalcRoomTemperatur;
-    getTargetTemperature(): number;
 }

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

@@ -76,14 +76,14 @@ class HeatGroup extends base_group_1.BaseGroup {
         return temp;
     }
     get desiredTemp() {
-        if (this.getHeater().length === 0) {
-            return -99;
+        if (!this.settings.automaticMode) {
+            return this.settings.manualTemperature;
         }
-        let value = 0;
-        for (const h of this.getHeater()) {
-            value += h.desiredTemperature;
+        const activeSetting = models_1.TemperatureSettings.getActiveSetting(this.settings.automaticPoints, new Date());
+        if (!activeSetting) {
+            return this.settings.automaticFallBackTemperatur;
         }
-        return Math.round((value / this.getHeater().length) * 10) / 10;
+        return activeSetting.temperature;
     }
     static getInfo() {
         var _a, _b, _c;
@@ -162,15 +162,5 @@ class HeatGroup extends base_group_1.BaseGroup {
             ac.onTemperaturChange(temp);
         });
     }
-    getTargetTemperature() {
-        if (!this.settings.automaticMode) {
-            return this.settings.manualTemperature;
-        }
-        const activeSetting = models_1.TemperatureSettings.getActiveSetting(this.settings.automaticPoints, new Date());
-        if (!activeSetting) {
-            return this.settings.manualTemperature;
-        }
-        return activeSetting.temperature;
-    }
 }
 exports.HeatGroup = HeatGroup;

package/lib/server/services/ac/ac-device.d.ts

@@ -13,6 +13,7 @@ export declare abstract class AcDevice implements iExcessEnergyConsumer, iRoomDe
     deviceCapabilities: DeviceCapability[];
     readonly blockAutomationHandler: BlockAutomaticHandler;
     protected _activatedByExcessEnergy: boolean;
+    protected _desiredTemperatur: number;
     protected _info: DeviceInfo;
     protected _room: RoomBase | undefined;
     protected _mode: AcMode;

package/lib/server/services/ac/ac-device.js

@@ -43,6 +43,7 @@ class AcDevice {
         this.settings = new models_1.AcSettings();
         this.deviceCapabilities = [DeviceCapability_1.DeviceCapability.ac, DeviceCapability_1.DeviceCapability.blockAutomatic];
         this._activatedByExcessEnergy = false;
+        this._desiredTemperatur = devices_1.UNDEFINED_TEMP_VALUE;
         this._mode = ac_mode_1.AcMode.Off;
         this._movementCallbackAdded = false;
         this._roomTemperature = 0;
@@ -96,8 +97,9 @@ class AcDevice {
         return this.calculateDesiredMode() !== ac_mode_1.AcMode.Off;
     }
     calculateDesiredMode() {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const acOn = this.on;
+        this._desiredTemperatur = (_c = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup) === null || _b === void 0 ? void 0 : _b.desiredTemp) !== null && _c !== void 0 ? _c : 0;
         if (this.settings.manualDisabled) {
             acOn && this.log(models_1.LogLevel.Info, `We should turn off now, as manual disable force is set.`);
             return ac_mode_1.AcMode.Off;
@@ -107,7 +109,7 @@ class AcDevice {
             acOn && this.log(models_1.LogLevel.Info, `We should turn off now, to respect night settings.`);
             return ac_mode_1.AcMode.Off;
         }
-        const heatGroup = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup;
+        const heatGroup = (_d = this.room) === null || _d === void 0 ? void 0 : _d.HeatGroup;
         if (this.settings.useOwnTemperatureAndAutomatic) {
             // Device is in automatic mode so ignore energy and room temperature
             if ((heatGroup === null || heatGroup === void 0 ? void 0 : heatGroup.settings.automaticMode) === false) {
@@ -116,14 +118,11 @@ class AcDevice {
             if (settings_service_1.SettingsService.heatMode !== config_1.HeatingMode.Sommer && this.settings.heatingAllowed) {
                 return ac_mode_1.AcMode.Heating;
             }
-            if (!this.settings.noCoolingOnMovement || ((_c = (_b = this.room) === null || _b === void 0 ? void 0 : _b.PraesenzGroup) === null || _c === void 0 ? void 0 : _c.anyPresent()) !== true) {
+            if (!this.settings.noCoolingOnMovement || ((_f = (_e = this.room) === null || _e === void 0 ? void 0 : _e.PraesenzGroup) === null || _f === void 0 ? void 0 : _f.anyPresent()) !== true) {
                 return ac_mode_1.AcMode.Cooling;
             }
             return ac_mode_1.AcMode.Off;
         }
-        if (this.settings.noCoolingOnMovement && ((_e = (_d = this.room) === null || _d === void 0 ? void 0 : _d.PraesenzGroup) === null || _e === void 0 ? void 0 : _e.anyPresent()) === true) {
-            return ac_mode_1.AcMode.Off;
-        }
         const temp = this.roomTemperature;
         if (temp === undefined || temp === devices_1.UNDEFINED_TEMP_VALUE) {
             this.log(models_1.LogLevel.Warn, `Can't calculate AC Mode as we have no room temperature`);
@@ -136,17 +135,20 @@ class AcDevice {
         let threshold = acOn ? 0.5 : 1.5;
         let thresholdHeating = acOn ? 0.5 : 1.5;
         let desiredMode = ac_mode_1.AcMode.Off;
-        const excessEnergy = (_g = (_f = devices_1.Devices.energymanager) === null || _f === void 0 ? void 0 : _f.excessEnergy) !== null && _g !== void 0 ? _g : -1;
+        const excessEnergy = (_h = (_g = devices_1.Devices.energymanager) === null || _g === void 0 ? void 0 : _g.excessEnergy) !== null && _h !== void 0 ? _h : -1;
         if ((acOn ? 200 : 1000) < excessEnergy) {
             // As there is plenty of energy to spare we plan to overshoot the target by 1 degree
             threshold = -0.5;
             thresholdHeating = -0.5;
         }
-        const targetTemp = heatGroup.getTargetTemperature();
+        const targetTemp = heatGroup.desiredTemp;
         const coolUntil = targetTemp + threshold;
         const heatUntil = targetTemp - thresholdHeating;
         if (temp > coolUntil && settings_service_1.SettingsService.heatMode === config_1.HeatingMode.Sommer) {
             desiredMode = ac_mode_1.AcMode.Cooling;
+            if (this.settings.noCoolingOnMovement && ((_k = (_j = this.room) === null || _j === void 0 ? void 0 : _j.PraesenzGroup) === null || _k === void 0 ? void 0 : _k.anyPresent()) === true) {
+                return ac_mode_1.AcMode.Off;
+            }
         }
         else if (temp < heatUntil && this.settings.heatingAllowed && settings_service_1.SettingsService.heatMode === config_1.HeatingMode.Winter) {
             desiredMode = ac_mode_1.AcMode.Heating;

package/lib/server/services/ac/own-daikin-device.js

@@ -81,8 +81,8 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
         });
     }
     setDesiredInfo(retry = false, forceTemp) {
-        var _a, _b, _c, _d;
-        let targetTemp = (_c = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup) === null || _b === void 0 ? void 0 : _b.getTargetTemperature()) !== null && _c !== void 0 ? _c : 21;
+        var _a;
+        let targetTemp = this._desiredTemperatur;
         if (this.desiredMode == daikin_controller_1.Mode.HOT) {
             targetTemp = this.settings.useOwnTemperatureAndAutomatic ? targetTemp + 1 : 29;
         }
@@ -95,7 +95,7 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
             targetHumidity: this.desiredHum,
             targetTemperature: forceTemp !== null && forceTemp !== void 0 ? forceTemp : targetTemp,
         };
-        (_d = this.device) === null || _d === void 0 ? void 0 : _d.setACControlInfo(changeObject, (err, res) => {
+        (_a = this.device) === null || _a === void 0 ? void 0 : _a.setACControlInfo(changeObject, (err, res) => {
             var _a;
             if (err !== null) {
                 log_service_1.ServerLogService.writeLog(models_1.LogLevel.Warn, `Setting Ac Info for ${this.name} failed:  ${err} `);