hoffmation-base 2.13.2 → 2.14.1

package/lib/models/deviceSettings/acSettings.d.ts

@@ -6,16 +6,6 @@ export declare class AcSettings extends DeviceSettings {
     minimumMinutes: number;
     maximumHours: number;
     maximumMinutes: number;
-    /**
-     * The temperature below which cooling should be stopped
-     * @type {number}
-     */
-    stopCoolingTemperatur: number;
-    /**
-     * The temperature above which heating should be stopped
-     * @type {number}
-     */
-    stopHeatingTemperatur: number;
     /**
      * Heating can be forbidden completly e.g. for summer season
      * @type {boolean}

package/lib/models/deviceSettings/acSettings.js

@@ -12,16 +12,6 @@ class AcSettings extends deviceSettings_1.DeviceSettings {
         this.minimumMinutes = 0;
         this.maximumHours = 24;
         this.maximumMinutes = 0;
-        /**
-         * The temperature below which cooling should be stopped
-         * @type {number}
-         */
-        this.stopCoolingTemperatur = 22;
-        /**
-         * The temperature above which heating should be stopped
-         * @type {number}
-         */
-        this.stopHeatingTemperatur = 21.0;
         /**
          * Heating can be forbidden completly e.g. for summer season
          * @type {boolean}
@@ -44,17 +34,15 @@ class AcSettings extends deviceSettings_1.DeviceSettings {
         this.manualDisabled = false;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         this.minimumHours = (_a = data.minimumHours) !== null && _a !== void 0 ? _a : this.minimumHours;
         this.minimumMinutes = (_b = data.minimumMinutes) !== null && _b !== void 0 ? _b : this.minimumMinutes;
         this.maximumHours = (_c = data.maximumHours) !== null && _c !== void 0 ? _c : this.maximumHours;
         this.maximumMinutes = (_d = data.maximumMinutes) !== null && _d !== void 0 ? _d : this.maximumMinutes;
-        this.stopCoolingTemperatur = (_e = data.stopCoolingTemperatur) !== null && _e !== void 0 ? _e : this.stopCoolingTemperatur;
-        this.stopHeatingTemperatur = (_f = data.stopHeatingTemperatur) !== null && _f !== void 0 ? _f : this.stopHeatingTemperatur;
-        this.heatingAllowed = (_g = data.heatingAllowed) !== null && _g !== void 0 ? _g : this.heatingAllowed;
-        this.noCoolingOnMovement = (_h = data.noCoolingOnMovement) !== null && _h !== void 0 ? _h : this.noCoolingOnMovement;
-        this.useOwnTemperatureAndAutomatic = (_j = data.useOwnTemperatureAndAutomatic) !== null && _j !== void 0 ? _j : this.useOwnTemperatureAndAutomatic;
-        this.manualDisabled = (_k = data.manualDisabled) !== null && _k !== void 0 ? _k : this.manualDisabled;
+        this.heatingAllowed = (_e = data.heatingAllowed) !== null && _e !== void 0 ? _e : this.heatingAllowed;
+        this.noCoolingOnMovement = (_f = data.noCoolingOnMovement) !== null && _f !== void 0 ? _f : this.noCoolingOnMovement;
+        this.useOwnTemperatureAndAutomatic = (_g = data.useOwnTemperatureAndAutomatic) !== null && _g !== void 0 ? _g : this.useOwnTemperatureAndAutomatic;
+        this.manualDisabled = (_h = data.manualDisabled) !== null && _h !== void 0 ? _h : this.manualDisabled;
         super.fromPartialObject(data);
     }
     toJSON() {

package/lib/models/deviceSettings/heaterSettings.d.ts

@@ -1,8 +1,5 @@
 import { DeviceSettings } from './deviceSettings';
-import { TemperatureSettings } from '../temperatureSettings';
-import { iIdHolder } from '../iIdHolder';
 export declare class HeaterSettings extends DeviceSettings {
-    automaticPoints: TemperatureSettings[];
     automaticMode: boolean;
     automaticFallBackTemperatur: number;
     useOwnTemperatur: boolean;
@@ -36,6 +33,4 @@ export declare class HeaterSettings extends DeviceSettings {
     pidForcedMinimum: number;
     fromPartialObject(data: Partial<HeaterSettings>): void;
     protected toJSON(): Partial<HeaterSettings>;
-    deleteAutomaticPoint(name: string, device: iIdHolder): void;
-    setAutomaticPoint(setting: TemperatureSettings, device: iIdHolder): void;
 }

package/lib/models/deviceSettings/heaterSettings.js

@@ -6,7 +6,6 @@ const server_1 = require("../../server");
 class HeaterSettings extends deviceSettings_1.DeviceSettings {
     constructor() {
         super(...arguments);
-        this.automaticPoints = [];
         this.automaticMode = true;
         this.automaticFallBackTemperatur = 20;
         this.useOwnTemperatur = true;
@@ -40,39 +39,20 @@ class HeaterSettings extends deviceSettings_1.DeviceSettings {
         this.pidForcedMinimum = 1;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        this.automaticPoints = (_a = data.automaticPoints) !== null && _a !== void 0 ? _a : this.automaticPoints;
-        this.automaticMode = (_b = data.automaticMode) !== null && _b !== void 0 ? _b : this.automaticMode;
-        this.automaticFallBackTemperatur = (_c = data.automaticFallBackTemperatur) !== null && _c !== void 0 ? _c : this.automaticFallBackTemperatur;
-        this.useOwnTemperatur = (_d = data.useOwnTemperatur) !== null && _d !== void 0 ? _d : this.useOwnTemperatur;
-        this.controlByPid = (_e = data.controlByPid) !== null && _e !== void 0 ? _e : this.controlByPid;
-        this.controlByTempDiff = (_f = data.controlByTempDiff) !== null && _f !== void 0 ? _f : this.controlByTempDiff;
-        this.seasonalTurnOffActive = (_g = data.seasonalTurnOffActive) !== null && _g !== void 0 ? _g : this.seasonalTurnOffActive;
-        this.seasonTurnOffDay = (_h = data.seasonTurnOffDay) !== null && _h !== void 0 ? _h : this.seasonTurnOffDay;
-        this.seasonTurnOnDay = (_j = data.seasonTurnOnDay) !== null && _j !== void 0 ? _j : this.seasonTurnOnDay;
-        this.pidForcedMinimum = (_k = data.pidForcedMinimum) !== null && _k !== void 0 ? _k : this.pidForcedMinimum;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        this.automaticMode = (_a = data.automaticMode) !== null && _a !== void 0 ? _a : this.automaticMode;
+        this.automaticFallBackTemperatur = (_b = data.automaticFallBackTemperatur) !== null && _b !== void 0 ? _b : this.automaticFallBackTemperatur;
+        this.useOwnTemperatur = (_c = data.useOwnTemperatur) !== null && _c !== void 0 ? _c : this.useOwnTemperatur;
+        this.controlByPid = (_d = data.controlByPid) !== null && _d !== void 0 ? _d : this.controlByPid;
+        this.controlByTempDiff = (_e = data.controlByTempDiff) !== null && _e !== void 0 ? _e : this.controlByTempDiff;
+        this.seasonalTurnOffActive = (_f = data.seasonalTurnOffActive) !== null && _f !== void 0 ? _f : this.seasonalTurnOffActive;
+        this.seasonTurnOffDay = (_g = data.seasonTurnOffDay) !== null && _g !== void 0 ? _g : this.seasonTurnOffDay;
+        this.seasonTurnOnDay = (_h = data.seasonTurnOnDay) !== null && _h !== void 0 ? _h : this.seasonTurnOnDay;
+        this.pidForcedMinimum = (_j = data.pidForcedMinimum) !== null && _j !== void 0 ? _j : this.pidForcedMinimum;
         super.fromPartialObject(data);
     }
     toJSON() {
         return server_1.Utils.jsonFilter(this);
     }
-    deleteAutomaticPoint(name, device) {
-        const currentIndex = this.automaticPoints.findIndex((v) => v.name === name);
-        if (currentIndex === -1) {
-            return;
-        }
-        this.automaticPoints.splice(currentIndex, 1);
-        this.persist(device);
-    }
-    setAutomaticPoint(setting, device) {
-        const currentIndex = this.automaticPoints.findIndex((v) => v.name === setting.name);
-        if (currentIndex === -1) {
-            this.automaticPoints.push(setting);
-        }
-        else {
-            this.automaticPoints[currentIndex] = setting;
-        }
-        this.persist(device);
-    }
 }
 exports.HeaterSettings = HeaterSettings;

package/lib/models/groupSettings/groupSettings.d.ts

@@ -0,0 +1,3 @@
+import { ObjectSettings } from '../objectSettings';
+export declare abstract class GroupSettings extends ObjectSettings {
+}

package/lib/models/groupSettings/groupSettings.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GroupSettings = void 0;
+const objectSettings_1 = require("../objectSettings");
+class GroupSettings extends objectSettings_1.ObjectSettings {
+}
+exports.GroupSettings = GroupSettings;

package/lib/models/groupSettings/heatGroupSettings.d.ts

@@ -0,0 +1,16 @@
+import { TemperatureSettings } from '../temperatureSettings';
+import { iIdHolder } from '../iIdHolder';
+import { GroupSettings } from './groupSettings';
+export declare class HeatGroupSettings extends GroupSettings {
+    automaticPoints: TemperatureSettings[];
+    automaticMode: boolean;
+    /**
+     * Target temperature when automaticMode is disabled
+     * @type {number}
+     */
+    manualTemperature: number;
+    fromPartialObject(data: Partial<HeatGroupSettings>): void;
+    protected toJSON(): Partial<HeatGroupSettings>;
+    deleteAutomaticPoint(name: string, device: iIdHolder): void;
+    setAutomaticPoint(setting: TemperatureSettings, device: iIdHolder): void;
+}

package/lib/models/groupSettings/heatGroupSettings.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HeatGroupSettings = void 0;
+const server_1 = require("../../server");
+const groupSettings_1 = require("./groupSettings");
+class HeatGroupSettings extends groupSettings_1.GroupSettings {
+    constructor() {
+        super(...arguments);
+        this.automaticPoints = [];
+        this.automaticMode = true;
+        /**
+         * Target temperature when automaticMode is disabled
+         * @type {number}
+         */
+        this.manualTemperature = 20;
+    }
+    fromPartialObject(data) {
+        var _a, _b, _c;
+        this.automaticPoints = (_a = data.automaticPoints) !== null && _a !== void 0 ? _a : this.automaticPoints;
+        this.automaticMode = (_b = data.automaticMode) !== null && _b !== void 0 ? _b : this.automaticMode;
+        this.manualTemperature = (_c = data.manualTemperature) !== null && _c !== void 0 ? _c : this.manualTemperature;
+        super.fromPartialObject(data);
+    }
+    toJSON() {
+        return server_1.Utils.jsonFilter(this);
+    }
+    deleteAutomaticPoint(name, device) {
+        const currentIndex = this.automaticPoints.findIndex((v) => v.name === name);
+        if (currentIndex === -1) {
+            return;
+        }
+        this.automaticPoints.splice(currentIndex, 1);
+        this.persist(device);
+    }
+    setAutomaticPoint(setting, device) {
+        const currentIndex = this.automaticPoints.findIndex((v) => v.name === setting.name);
+        if (currentIndex === -1) {
+            this.automaticPoints.push(setting);
+        }
+        else {
+            this.automaticPoints[currentIndex] = setting;
+        }
+        this.persist(device);
+    }
+}
+exports.HeatGroupSettings = HeatGroupSettings;

package/lib/models/rooms/RoomBase.js

@@ -87,6 +87,9 @@ class RoomBase {
         (_c = this.LightGroup) === null || _c === void 0 ? void 0 : _c.initialize();
         (_d = this.TasterGroup) === null || _d === void 0 ? void 0 : _d.initCallbacks();
         (_e = this.HeatGroup) === null || _e === void 0 ? void 0 : _e.initialize();
+        for (const group of this.groupMap.values()) {
+            server_1.RoomService.Groups.set(group.id, group);
+        }
     }
     persist() {
         var _a;

package/lib/server/devices/baseDeviceInterfaces/iHeater.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { HeaterSettings, TemperatureSettings } from '../../../models';
+import { HeaterSettings } from '../../../models';
 import { iRoomDevice } from './iRoomDevice';
 export interface iHeater extends iRoomDevice {
     settings: HeaterSettings;
@@ -10,8 +10,6 @@ export interface iHeater extends iRoomDevice {
     roomTemperature: number;
     readonly persistHeaterInterval: NodeJS.Timeout;
     seasonTurnOff: boolean;
-    deleteAutomaticPoint(name: string): void;
-    setAutomaticPoint(setting: TemperatureSettings): void;
     stopAutomaticCheck(): void;
     checkAutomaticChange(): void;
     onTemperaturChange(newTemperatur: number): void;

package/lib/server/devices/groups/base-group.d.ts

@@ -2,12 +2,17 @@ import { GroupType } from './group-type';
 import { DeviceCluster } from '../device-cluster';
 import { LogLevel, RoomBase } from '../../../models';
 import { LogDebugType } from '../../services';
-export declare class BaseGroup {
+import { iIdHolder } from '../../../models/iIdHolder';
+import { GroupSettings } from '../../../models/groupSettings/groupSettings';
+export declare class BaseGroup implements iIdHolder {
     roomName: string;
     type: GroupType;
+    settings: GroupSettings | undefined;
+    get customName(): string;
+    id: string;
     constructor(roomName: string, type: GroupType);
     protected _deviceCluster: DeviceCluster;
     get deviceCluster(): DeviceCluster;
     getRoom(): RoomBase;
-    protected log(level: LogLevel, message: string, debugType?: LogDebugType): void;
+    log(level: LogLevel, message: string, debugType?: LogDebugType): void;
 }

package/lib/server/devices/groups/base-group.js

@@ -5,10 +5,15 @@ const group_type_1 = require("./group-type");
 const device_cluster_1 = require("../device-cluster");
 const services_1 = require("../../services");
 class BaseGroup {
+    get customName() {
+        return `${group_type_1.GroupType[this.type]} ${this.getRoom().customName}`;
+    }
     constructor(roomName, type) {
         this.roomName = roomName;
         this.type = type;
+        this.settings = undefined;
         this._deviceCluster = new device_cluster_1.DeviceCluster();
+        this.id = `${this.roomName}-${group_type_1.GroupType[this.type]}`;
     }
     get deviceCluster() {
         return this._deviceCluster;

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

@@ -1,7 +1,10 @@
 import { BaseGroup } from './base-group';
 import { iHeater, iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
 import { AcDevice } from '../../services';
+import { HeatGroupSettings } from '../../../models/groupSettings/heatGroupSettings';
+import { TemperatureSettings } from '../../../models';
 export declare class HeatGroup extends BaseGroup {
+    settings: HeatGroupSettings;
     constructor(roomName: string, heaterIds: string[], tempSensorIds: string[], humiditySensorIds: string[], acIds: string[]);
     /**
      * The current measured temperature of the room in Celsius
@@ -26,5 +29,8 @@ export declare class HeatGroup extends BaseGroup {
      * @param {boolean} force Whether this was a manual trigger, thus blocking automatic changes for 1 hour
      */
     setAc(newDesiredState: boolean, force?: boolean): void;
+    deleteAutomaticPoint(name: string): void;
+    setAutomaticPoint(setting: TemperatureSettings): void;
     private recalcRoomTemperatur;
+    getTargetTemperature(): number;
 }

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

@@ -7,10 +7,12 @@ const device_cluster_type_1 = require("../device-cluster-type");
 const device_list_1 = require("../device-list");
 const baseDeviceInterfaces_1 = require("../baseDeviceInterfaces");
 const services_1 = require("../../services");
+const heatGroupSettings_1 = require("../../../models/groupSettings/heatGroupSettings");
 const models_1 = require("../../../models");
 class HeatGroup extends base_group_1.BaseGroup {
     constructor(roomName, heaterIds, tempSensorIds, humiditySensorIds, acIds) {
         super(roomName, group_type_1.GroupType.Heating);
+        this.settings = new heatGroupSettings_1.HeatGroupSettings();
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Heater, new device_list_1.DeviceList(heaterIds));
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.TemperaturSensor, new device_list_1.DeviceList(tempSensorIds));
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.HumiditySensor, new device_list_1.DeviceList(humiditySensorIds));
@@ -139,6 +141,12 @@ class HeatGroup extends base_group_1.BaseGroup {
             }
         }
     }
+    deleteAutomaticPoint(name) {
+        this.settings.deleteAutomaticPoint(name, this);
+    }
+    setAutomaticPoint(setting) {
+        this.settings.setAutomaticPoint(setting, this);
+    }
     recalcRoomTemperatur() {
         const temp = this.temperature;
         if (temp == baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
@@ -154,5 +162,15 @@ 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/devices/hmIPDevices/hmIpHeizgruppe.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { HmIPDevice } from './hmIpDevice';
 import { iDisposable } from '../../services';
-import { HeaterSettings, TemperatureSettings } from '../../../models';
+import { HeaterSettings } from '../../../models';
 import { iHeater, iHumiditySensor, iTemperatureSensor } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSensor, iHumiditySensor, iHeater, iDisposable {
@@ -36,8 +36,6 @@ export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSe
     get roomTemperature(): number;
     set roomTemperature(value: number);
     addHumidityCallback(pCallback: (pValue: number) => void): void;
-    deleteAutomaticPoint(name: string): void;
-    setAutomaticPoint(setting: TemperatureSettings): void;
     getBelongingHeizungen(): iHeater[];
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     stopAutomaticCheck(): void;

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

@@ -107,12 +107,6 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
             pCallback(this._humidity);
         }
     }
-    deleteAutomaticPoint(name) {
-        this.settings.deleteAutomaticPoint(name, this);
-    }
-    setAutomaticPoint(setting) {
-        this.settings.setAutomaticPoint(setting, this);
-    }
     getBelongingHeizungen() {
         if (!this.room) {
             return [];
@@ -135,14 +129,15 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         }
     }
     checkAutomaticChange() {
-        var _a;
+        var _a, _b, _c, _d, _e, _f, _g;
         if (!this._initialSeasonCheckDone) {
             this.checkSeasonTurnOff();
         }
-        if (!this.settings.automaticMode || this.seasonTurnOff) {
+        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) {
             return;
         }
-        const setting = models_1.TemperatureSettings.getActiveSetting(this.settings.automaticPoints, new Date());
+        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.`);
             this.desiredTemperature = this.settings.automaticFallBackTemperatur;
@@ -150,7 +145,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         }
         if (this._desiredTemperature !== setting.temperature) {
             this.log(models_1.LogLevel.Debug, `Automatische Temperaturanpassung für ${this.info.customName} auf ${setting.temperature}°C`);
-            this.desiredTemperature = (_a = setting.temperature) !== null && _a !== void 0 ? _a : this.settings.automaticFallBackTemperatur;
+            this.desiredTemperature = (_g = setting.temperature) !== null && _g !== void 0 ? _g : this.settings.automaticFallBackTemperatur;
         }
     }
     addTempChangeCallback(pCallback) {

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { ZigbeeDevice } from './zigbeeDevice';
 import { iBatteryDevice, iHeater } from '../../baseDeviceInterfaces';
-import { HeaterSettings, TemperatureSettings } from '../../../../models';
+import { HeaterSettings } from '../../../../models';
 import { DeviceType } from '../../deviceType';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { PIDController } from '../../../../liquid-pid';
@@ -35,8 +35,6 @@ export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater, iBatt
     get roomTemperature(): number;
     set roomTemperatur(val: number);
     checkAutomaticChange(): void;
-    deleteAutomaticPoint(name: string): void;
-    setAutomaticPoint(setting: TemperatureSettings): void;
     stopAutomaticCheck(): void;
     onTemperaturChange(newTemperatur: number): void;
     persistHeater(): void;

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

@@ -91,13 +91,15 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         this._roomTemperature = val;
     }
     checkAutomaticChange() {
+        var _a, _b, _c, _d, _e, _f;
         if (!this._initialSeasonCheckDone) {
             this.checkSeasonTurnOff();
         }
-        if (!this.settings.automaticMode || this.seasonTurnOff) {
+        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) {
             return;
         }
-        const setting = models_1.TemperatureSettings.getActiveSetting(this.settings.automaticPoints, new Date());
+        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.`);
             this.desiredTemperature = this.settings.automaticFallBackTemperatur;
@@ -108,12 +110,6 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
             this.desiredTemperature = setting.temperature;
         }
     }
-    deleteAutomaticPoint(name) {
-        this.settings.deleteAutomaticPoint(name, this);
-    }
-    setAutomaticPoint(setting) {
-        this.settings.setAutomaticPoint(setting, this);
-    }
     stopAutomaticCheck() {
         if (this._iAutomaticInterval !== undefined) {
             clearInterval(this._iAutomaticInterval);

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

@@ -41,14 +41,14 @@ export declare abstract class AcDevice implements iExcessEnergyConsumer, iRoomDe
      * @param {number} timeout
      */
     deactivateAutomaticChange(timeout?: number): void;
-    abstract setDesiredMode(mode: AcMode, writeToDevice: boolean): void;
+    abstract setDesiredMode(mode: AcMode, writeToDevice: boolean, temp?: number): void;
     abstract turnOn(): void;
     onTemperaturChange(newTemperatur: number): void;
     persist(): void;
     turnOnForExcessEnergy(): void;
     abstract turnOff(): void;
     turnOffDueToMissingEnergy(): void;
-    setState(mode: AcMode, forceTime?: number): void;
+    setState(mode: AcMode, desiredTemp?: number, forceTime?: number): void;
     log(level: LogLevel, message: string, debugType?: LogDebugType): void;
     wasActivatedByExcessEnergy(): boolean;
     loadDeviceSettings(): void;

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

@@ -96,7 +96,7 @@ class AcDevice {
         return this.calculateDesiredMode() !== ac_mode_1.AcMode.Off;
     }
     calculateDesiredMode() {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         const acOn = this.on;
         if (this.settings.manualDisabled) {
             acOn && this.log(models_1.LogLevel.Info, `We should turn off now, as manual disable force is set.`);
@@ -107,17 +107,21 @@ 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;
         if (this.settings.useOwnTemperatureAndAutomatic) {
             // Device is in automatic mode so ignore energy and room temperature
-            if (settings_service_1.SettingsService.heatMode !== config_1.HeatingMode.Sommer) {
+            if ((heatGroup === null || heatGroup === void 0 ? void 0 : heatGroup.settings.automaticMode) === false) {
+                return ac_mode_1.AcMode.Auto;
+            }
+            if (settings_service_1.SettingsService.heatMode !== config_1.HeatingMode.Sommer && this.settings.heatingAllowed) {
                 return ac_mode_1.AcMode.Heating;
             }
-            if (!this.settings.noCoolingOnMovement || ((_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.PraesenzGroup) === null || _b === void 0 ? void 0 : _b.anyPresent()) !== true) {
+            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) {
                 return ac_mode_1.AcMode.Cooling;
             }
             return ac_mode_1.AcMode.Off;
         }
-        if (this.settings.noCoolingOnMovement && ((_d = (_c = this.room) === null || _c === void 0 ? void 0 : _c.PraesenzGroup) === null || _d === void 0 ? void 0 : _d.anyPresent()) === true) {
+        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;
@@ -125,17 +129,22 @@ class AcDevice {
             this.log(models_1.LogLevel.Warn, `Can't calculate AC Mode as we have no room temperature`);
             return ac_mode_1.AcMode.Off;
         }
-        let threshold = acOn ? 0 : 1;
-        let thresholdHeating = acOn ? 0 : 0.5;
+        if (!heatGroup) {
+            this.log(models_1.LogLevel.Warn, `Can't calculate AC Mode as we have no heat group`);
+            return ac_mode_1.AcMode.Off;
+        }
+        let threshold = acOn ? 0.5 : 1.5;
+        let thresholdHeating = acOn ? 0.5 : 1.5;
         let desiredMode = ac_mode_1.AcMode.Off;
-        const excessEnergy = (_f = (_e = devices_1.Devices.energymanager) === null || _e === void 0 ? void 0 : _e.excessEnergy) !== null && _f !== void 0 ? _f : -1;
+        const excessEnergy = (_g = (_f = devices_1.Devices.energymanager) === null || _f === void 0 ? void 0 : _f.excessEnergy) !== null && _g !== void 0 ? _g : -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 coolUntil = this.settings.stopCoolingTemperatur + threshold;
-        const heatUntil = this.settings.stopHeatingTemperatur - thresholdHeating;
+        const targetTemp = heatGroup.getTargetTemperature();
+        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;
         }
@@ -175,14 +184,14 @@ class AcDevice {
     turnOffDueToMissingEnergy() {
         this.turnOff();
     }
-    setState(mode, forceTime = 60 * 60 * 1000) {
+    setState(mode, desiredTemp, forceTime = 60 * 60 * 1000) {
         this.blockAutomationHandler.disableAutomatic(forceTime);
         this._mode = mode;
         if (mode == ac_mode_1.AcMode.Off) {
             this.turnOff();
             return;
         }
-        this.setDesiredMode(mode, false);
+        this.setDesiredMode(mode, false, desiredTemp);
         this.turnOn();
     }
     log(level, message, debugType = log_service_1.LogDebugType.None) {
@@ -207,7 +216,6 @@ class AcDevice {
         }, 5000, this);
     }
     automaticCheck() {
-        var _a;
         if (this.blockAutomationHandler.automaticBlockActive) {
             // We aren't allowed to turn on or off anyway --> exit
             return;
@@ -217,11 +225,7 @@ class AcDevice {
             // Device already in desired state --> do nothing
             return;
         }
-        if (desiredMode === ac_mode_1.AcMode.Heating && ((_a = settings_service_1.SettingsService.settings.heaterSettings) === null || _a === void 0 ? void 0 : _a.allowAcHeating)) {
-            this.setDesiredMode(ac_mode_1.AcMode.Heating, false);
-            this.turnOn();
-            return;
-        }
+        this.setDesiredMode(desiredMode, false);
         if (desiredMode == ac_mode_1.AcMode.Off) {
             this.turnOff();
             return;

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

@@ -4,7 +4,6 @@ import { AcMode } from './ac-mode';
 import { DeviceType } from '../../devices';
 export declare class OwnDaikinDevice extends AcDevice {
     desiredState: boolean;
-    desiredTemp: number;
     desiredHum: number | 'AUTO';
     desiredMode: number;
     deviceType: DeviceType;
@@ -14,7 +13,7 @@ export declare class OwnDaikinDevice extends AcDevice {
     get device(): DaikinAC | undefined;
     get on(): boolean;
     set device(device: DaikinAC | undefined);
-    setDesiredMode(mode: AcMode, writeToDevice?: boolean): void;
+    setDesiredMode(mode: AcMode, writeToDevice?: boolean, desiredTemp?: number): void;
     turnOn(): void;
     turnOff(): void;
     protected automaticCheck(): void;

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

@@ -15,7 +15,6 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
     constructor(name, roomName, ip, device) {
         super(name, roomName, ip, acDeviceType_1.AcDeviceType.Daikin);
         this.desiredState = daikin_controller_1.Power.OFF;
-        this.desiredTemp = 21;
         this.desiredHum = 'AUTO';
         this.desiredMode = daikin_controller_1.Mode.COLD;
         this.deviceType = devices_1.DeviceType.Daikin;
@@ -41,7 +40,7 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
         }
         void this.updateInfo();
     }
-    setDesiredMode(mode, writeToDevice = true) {
+    setDesiredMode(mode, writeToDevice = true, desiredTemp) {
         let newMode = -1;
         switch (mode) {
             case ac_mode_1.AcMode.Heating:
@@ -60,7 +59,7 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
         this.desiredMode = newMode;
         this._mode = mode;
         if (writeToDevice) {
-            this.setDesiredInfo();
+            this.setDesiredInfo(false, desiredTemp);
         }
     }
     turnOn() {
@@ -81,22 +80,22 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
             super.automaticCheck();
         });
     }
-    setDesiredInfo(retry = false) {
-        var _a;
-        let targetTemp = this.desiredTemp;
+    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;
         if (this.desiredMode == daikin_controller_1.Mode.HOT) {
-            targetTemp = this.settings.useOwnTemperatureAndAutomatic ? this.settings.stopHeatingTemperatur : 29;
+            targetTemp = this.settings.useOwnTemperatureAndAutomatic ? targetTemp + 1 : 29;
         }
         else if (this.desiredMode == daikin_controller_1.Mode.COLD) {
-            targetTemp = this.settings.useOwnTemperatureAndAutomatic ? this.settings.stopCoolingTemperatur : 16;
+            targetTemp = this.settings.useOwnTemperatureAndAutomatic ? targetTemp - 1 : 16;
         }
         const changeObject = {
             power: this.desiredState,
             mode: this.desiredMode,
             targetHumidity: this.desiredHum,
-            targetTemperature: targetTemp,
+            targetTemperature: forceTemp !== null && forceTemp !== void 0 ? forceTemp : targetTemp,
         };
-        (_a = this.device) === null || _a === void 0 ? void 0 : _a.setACControlInfo(changeObject, (err, res) => {
+        (_d = this.device) === null || _d === void 0 ? void 0 : _d.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} `);