hoffmation-base 1.0.13 → 1.0.16

package/lib/index.js

@@ -72,7 +72,7 @@ class HoffmationBase {
             server_1.SonosService.initialize();
         }
         if ((_b = server_1.SettingsService.settings.daikin) === null || _b === void 0 ? void 0 : _b.active) {
-            server_1.DaikinService.addOwnDevices(server_1.OwnDaikinDevices.ownDevices);
+            server_1.DaikinService.addOwnDevices(server_1.OwnAcDevices.ownDevices);
             server_1.DaikinService.initialize();
         }
         server_1.Utils.guardedNewThread(() => {

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

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

package/lib/models/deviceSettings/acSettings.js

@@ -9,6 +9,21 @@ class AcSettings extends deviceSettings_1.DeviceSettings {
         this.minimumMinutes = 0;
         this.maximumHours = 24;
         this.maximumMinutes = 0;
+        /**
+         * The temperatur below which cooling should be stopped
+         * @type {number}
+         */
+        this.stopCoolingTemperatur = 22;
+        /**
+         * The temperatur above which heating should be stopped
+         * @type {number}
+         */
+        this.stopHeatingTemperatur = 21.0;
+        /**
+         * Heating can be forbidden completly e.g. for summer season
+         * @type {boolean}
+         */
+        this.heatingAllowed = false;
     }
 }
 exports.AcSettings = AcSettings;

package/lib/models/rooms/RoomBase.d.ts

@@ -1,5 +1,5 @@
 import { TimeCallback } from '../timeCallback';
-import { AcGroup, BaseGroup, DeviceCluster, FensterGroup, GroupType, HeatGroup, LampenGroup, PraesenzGroup, SmokeGroup, SonosGroup, TasterGroup, WaterGroup } from '../../server';
+import { BaseGroup, DeviceCluster, FensterGroup, GroupType, HeatGroup, LampenGroup, PraesenzGroup, SmokeGroup, SonosGroup, TasterGroup, WaterGroup } from '../../server';
 import { RoomSettings } from './RoomSettings';
 import { iRoomBase } from './iRoomBase';
 import { RoomInfo } from './roomInfo';
@@ -15,7 +15,6 @@ export declare class RoomBase implements iRoomBase {
     constructor(roomName: string, settings: RoomSettings, groups: Map<GroupType, BaseGroup>);
     protected _deviceCluster: DeviceCluster;
     get deviceCluster(): DeviceCluster;
-    get AcGroup(): AcGroup | undefined;
     get FensterGroup(): FensterGroup | undefined;
     get PraesenzGroup(): PraesenzGroup | undefined;
     get LampenGroup(): LampenGroup | undefined;

package/lib/models/rooms/RoomBase.js

@@ -23,9 +23,6 @@ class RoomBase {
     get deviceCluster() {
         return this._deviceCluster;
     }
-    get AcGroup() {
-        return this.groups.get(server_1.GroupType.Ac);
-    }
     get FensterGroup() {
         return this.groups.get(server_1.GroupType.Window);
     }

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

@@ -1,6 +1,5 @@
 import { HmIpHeizgruppe } from './hmIPDevices';
 export declare class Heizgruppen {
-    static getInfo(): string;
     static getSpecificInfo(pText: string | undefined): Promise<string>;
     static getProblems(): string;
     static getAllGruppen(): HmIpHeizgruppe[];

package/lib/server/devices/Heizgruppen.js

@@ -4,19 +4,8 @@ exports.Heizgruppen = void 0;
 const deviceType_1 = require("./deviceType");
 const devices_1 = require("./devices");
 const services_1 = require("../services");
+const groups_1 = require("./groups");
 class Heizgruppen {
-    static getInfo() {
-        const gruppen = Heizgruppen.getAllGruppen();
-        gruppen.sort((a, b) => {
-            return a.info.customName.localeCompare(b.info.customName);
-        });
-        const response = [`Dies sind die aktuellen Informationen der Heizungen:`];
-        response.push(`Name\t\tLuft Feuchtigkeit\t\tAktuelle Temperatur\t\tSoll Temperatur\t\tVentilstellung`);
-        for (const g of gruppen) {
-            response.push(`${g.info.customName}:\t\t${g.humidity}%\t\t${g.sTemperatur}\t\t${g.desiredTemperatur}°C\t\t${g.sLevel}`);
-        }
-        return response.join('\n');
-    }
     static async getSpecificInfo(pText) {
         var _a, _b;
         if (pText === undefined || !pText.includes('"')) {
@@ -25,7 +14,7 @@ class Heizgruppen {
         const searchText = pText.split('"')[1];
         const group = this.getSpecificGroup(searchText);
         if (group === undefined) {
-            return `"${searchText}" ist keine gültige Heizgruppe, im Folgenden ist eine Liste aller gültigen Heizgruppen:\n${this.getInfo()}`;
+            return `"${searchText}" ist keine gültige Heizgruppe, im Folgenden ist eine Liste aller gültigen Heizgruppen:\n${groups_1.HeatGroup.getInfo()}`;
         }
         const results = (_b = (await ((_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.readTemperaturDataPoint(group, 20)))) !== null && _b !== void 0 ? _b : [];
         const response = [`Dies sind die letzten 20 Messpunkte der Heizgruppe:`];

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

@@ -1,4 +1,5 @@
 import { IBaseDevice } from './iBaseDevice';
+export declare const UNDEFINED_HUMIDITY_VALUE = -1;
 export interface iHumiditySensor extends IBaseDevice {
     humidity: number;
     addHumidityCallback(pCallback: (pValue: number) => void): void;

package/lib/server/devices/baseDeviceInterfaces/iHumiditySensor.js

@@ -1,2 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.UNDEFINED_HUMIDITY_VALUE = void 0;
+exports.UNDEFINED_HUMIDITY_VALUE = -1;

package/lib/server/devices/device-list.d.ts

@@ -3,8 +3,8 @@ import { IBaseDevice } from './baseDeviceInterfaces';
 export declare class DeviceList {
     private _ids;
     private readonly _isSonos;
-    private readonly _isDaikin;
-    constructor(_ids?: string[], _isSonos?: boolean, _isDaikin?: boolean);
+    private readonly _isAc;
+    constructor(_ids?: string[], _isSonos?: boolean, _isAc?: boolean);
     get ids(): string[];
     getDevices(): Array<IBaseDevice | OwnSonosDevice | AcDevice>;
 }

package/lib/server/devices/device-list.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceList = void 0;
 const services_1 = require("../services");
 class DeviceList {
-    constructor(_ids = [], _isSonos = false, _isDaikin = false) {
+    constructor(_ids = [], _isSonos = false, _isAc = false) {
         this._ids = _ids;
         this._isSonos = _isSonos;
-        this._isDaikin = _isDaikin;
+        this._isAc = _isAc;
         // Empty
     }
     get ids() {
@@ -21,10 +21,10 @@ class DeviceList {
                     result.push(services_1.OwnSonosDevices.ownDevices[dID]);
                 }
             }
-            else if (this._isDaikin) {
-                const daikinDevice = services_1.OwnDaikinDevices.ownDevices[dID];
-                if (daikinDevice !== undefined) {
-                    result.push(services_1.OwnDaikinDevices.ownDevices[dID]);
+            else if (this._isAc) {
+                const acDevice = services_1.OwnAcDevices.ownDevices[dID];
+                if (acDevice !== undefined) {
+                    result.push(services_1.OwnAcDevices.ownDevices[dID]);
                 }
             }
             else {

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

@@ -84,7 +84,7 @@ class FensterGroup extends base_group_1.BaseGroup {
             }
             let desiredPos = f.desiredPosition;
             if (desiredPos > 0) {
-                services_1.WeatherService.weatherRolloPosition(desiredPos, (_b = (_a = room.HeatGroup) === null || _a === void 0 ? void 0 : _a.desiredTemp) !== null && _b !== void 0 ? _b : -99, (_d = (_c = room.HeatGroup) === null || _c === void 0 ? void 0 : _c.currentTemp) !== null && _d !== void 0 ? _d : -99);
+                services_1.WeatherService.weatherRolloPosition(desiredPos, (_b = (_a = room.HeatGroup) === null || _a === void 0 ? void 0 : _a.desiredTemp) !== null && _b !== void 0 ? _b : -99, (_d = (_c = room.HeatGroup) === null || _c === void 0 ? void 0 : _c.temperature) !== null && _d !== void 0 ? _d : -99);
             }
             if (f.griffeInPosition(models_2.FensterPosition.offen) > 0 && desiredPos < 100) {
                 return;

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

@@ -1,12 +1,30 @@
 import { BaseGroup } from './base-group';
 import { iHeater, iHumiditySensor, iTemperaturSensor } from '../baseDeviceInterfaces';
+import { AcDevice } from '../../services';
 export declare class HeatGroup extends BaseGroup {
-    constructor(roomName: string, heaterIds: string[], tempSensorIds: string[], humiditySensorIds: string[]);
-    get currentTemp(): number;
+    constructor(roomName: string, heaterIds: string[], tempSensorIds: string[], humiditySensorIds: string[], acIds: string[]);
+    /**
+     * The current measured temperature of the room in Celsius
+     * @returns {number}
+     */
+    get humidity(): number;
+    /**
+     * The current measured temperature of the room in Celsius
+     * @returns {number}
+     */
+    get temperature(): number;
     get desiredTemp(): number;
+    static getInfo(): string;
     getHeater(): iHeater[];
     getTempSensors(): iTemperaturSensor[];
     getHumiditySensors(): iHumiditySensor[];
+    getOwnAcDevices(): AcDevice[];
     initialize(): void;
+    /**
+     * Sets all ACs to new desired Value
+     * @param {boolean} newDesiredState
+     * @param {boolean} force Whether this was a manual trigger, thus blocking automatic changes for 1 hour
+     */
+    setAc(newDesiredState: boolean, force?: boolean): void;
     private recalcRoomTemperatur;
 }

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

@@ -6,51 +6,42 @@ const group_type_1 = require("./group-type");
 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 models_1 = require("../../../models");
 class HeatGroup extends base_group_1.BaseGroup {
-    constructor(roomName, heaterIds, tempSensorIds, humiditySensorIds) {
+    constructor(roomName, heaterIds, tempSensorIds, humiditySensorIds, acIds) {
         super(roomName, group_type_1.GroupType.Heating);
         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));
+        this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Ac, new device_list_1.DeviceList(acIds, false, true));
     }
-    get currentTemp() {
-        if (this.getHeater().length === 0) {
-            return -99;
-        }
-        let value = 0;
-        const sensors = this.getTempSensors();
-        for (const h of sensors) {
-            value += h.iTemperatur;
-        }
-        return Math.round((value / sensors.length) * 10) / 10;
-    }
-    get desiredTemp() {
-        if (this.getHeater().length === 0) {
-            return -99;
-        }
-        let value = 0;
-        for (const h of this.getHeater()) {
-            value += h.desiredTemperatur;
-        }
-        return Math.round((value / this.getHeater().length) * 10) / 10;
-    }
-    getHeater() {
-        return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Heater);
-    }
-    getTempSensors() {
-        return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.TemperaturSensor);
-    }
-    getHumiditySensors() {
-        return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.HumiditySensor);
-    }
-    initialize() {
-        this.getTempSensors().forEach((sensor) => {
-            sensor.addTempChangeCallback((_newVal) => {
-                this.recalcRoomTemperatur();
-            });
+    /**
+     * The current measured temperature of the room in Celsius
+     * @returns {number}
+     */
+    get humidity() {
+        let humidity = baseDeviceInterfaces_1.UNDEFINED_HUMIDITY_VALUE;
+        let count = 0;
+        this.getHumiditySensors().forEach((sensor) => {
+            const sensorValue = sensor.humidity;
+            if (sensorValue === baseDeviceInterfaces_1.UNDEFINED_HUMIDITY_VALUE) {
+                return;
+            }
+            if (count === 0) {
+                count = 1;
+                humidity = sensorValue;
+                return;
+            }
+            humidity = (humidity * count + sensorValue) / ++count;
         });
+        return humidity;
     }
-    recalcRoomTemperatur() {
+    /**
+     * The current measured temperature of the room in Celsius
+     * @returns {number}
+     */
+    get temperature() {
         let temp = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         let count = 0;
         this.getTempSensors().forEach((sensor) => {
@@ -80,7 +71,78 @@ class HeatGroup extends base_group_1.BaseGroup {
             }
             temp = (temp * count + sensorValue) / ++count;
         });
-        if (temp === baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
+        return temp;
+    }
+    get desiredTemp() {
+        if (this.getHeater().length === 0) {
+            return -99;
+        }
+        let value = 0;
+        for (const h of this.getHeater()) {
+            value += h.desiredTemperatur;
+        }
+        return Math.round((value / this.getHeater().length) * 10) / 10;
+    }
+    static getInfo() {
+        var _a, _b, _c;
+        const rooms = Array.from(services_1.API.getRooms().values()).filter((r) => {
+            return r.HeatGroup !== undefined;
+        });
+        rooms.sort((a, b) => {
+            return a.roomName.localeCompare(b.roomName);
+        });
+        const response = [`Dies sind die aktuellen Informationen der Heizungen:`];
+        response.push(`Name\t\tLuft Feuchtigkeit\t\tAktuelle Temperatur\t\tSoll Temperatur\t\tVentilstellung`);
+        for (const r of rooms) {
+            response.push(`${r.roomName}:\t\t${(_a = r.HeatGroup) === null || _a === void 0 ? void 0 : _a.humidity}%\t\t${(_b = r.HeatGroup) === null || _b === void 0 ? void 0 : _b.temperature}\t\t${(_c = r.HeatGroup) === null || _c === void 0 ? void 0 : _c.desiredTemp}°C`);
+        }
+        return response.join('\n');
+    }
+    getHeater() {
+        return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Heater);
+    }
+    getTempSensors() {
+        return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.TemperaturSensor);
+    }
+    getHumiditySensors() {
+        return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.HumiditySensor);
+    }
+    getOwnAcDevices() {
+        return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Ac);
+    }
+    initialize() {
+        this.getTempSensors().forEach((sensor) => {
+            sensor.addTempChangeCallback((_newVal) => {
+                this.recalcRoomTemperatur();
+            });
+        });
+        this.getOwnAcDevices().forEach((acDev) => {
+            acDev.room = this.getRoom();
+        });
+    }
+    /**
+     * Sets all ACs to new desired Value
+     * @param {boolean} newDesiredState
+     * @param {boolean} force Whether this was a manual trigger, thus blocking automatic changes for 1 hour
+     */
+    setAc(newDesiredState, force = false) {
+        const devs = this.getOwnAcDevices();
+        this.log(models_1.LogLevel.Debug, `set ${devs.length} Ac's to new State: ${newDesiredState}`);
+        for (const dev of devs) {
+            if (newDesiredState) {
+                dev.turnOn();
+                continue;
+            }
+            if (force) {
+                dev.deactivateAutomaticTurnOn(60 * 60 * 1000);
+                continue;
+            }
+            dev.turnOff();
+        }
+    }
+    recalcRoomTemperatur() {
+        const temp = this.temperature;
+        if (temp == baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
             return;
         }
         this.getHeater().forEach((heater) => {

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

@@ -1,4 +1,3 @@
-export * from './acGroup';
 export * from './base-group';
 export * from './Fenster';
 export * from './fensterGroup';

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

@@ -14,7 +14,6 @@ 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("./acGroup"), exports);
 __exportStar(require("./base-group"), exports);
 __exportStar(require("./Fenster"), exports);
 __exportStar(require("./fensterGroup"), exports);

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

@@ -54,13 +54,13 @@ class TasterGroup extends base_group_1.BaseGroup {
                 }
             }
             if (((_j = services_1.SettingsService.settings.daikin) === null || _j === void 0 ? void 0 : _j.buttonBotRightForAc) === true) {
-                const acGroup = this.getRoom().AcGroup;
-                if (acGroup !== undefined && acGroup.getOwnAcDevices().length > 0) {
+                const heatGroup = this.getRoom().HeatGroup;
+                if (heatGroup !== undefined && heatGroup.getOwnAcDevices().length > 0) {
                     (_k = t.buttonBotRight) === null || _k === void 0 ? void 0 : _k.addCb(button_1.ButtonPressType.short, (pValue) => {
-                        pValue && acGroup.setAc(true);
+                        pValue && heatGroup.setAc(true);
                     });
                     (_l = t.buttonBotRight) === null || _l === void 0 ? void 0 : _l.addCb(button_1.ButtonPressType.long, (pValue) => {
-                        pValue && acGroup.setAc(false, true);
+                        pValue && heatGroup.setAc(false, true);
                     });
                 }
             }

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

@@ -75,7 +75,7 @@ class HmIpGriff extends hmIpDevice_1.HmIPDevice {
                 const heatgroup = (_a = this._fenster) === null || _a === void 0 ? void 0 : _a.getRoom().HeatGroup;
                 if (heatgroup !== undefined) {
                     const desiredTemp = heatgroup.desiredTemp;
-                    const currentTemp = heatgroup.currentTemp;
+                    const currentTemp = heatgroup.temperature;
                     const outSideTemp = services_1.WeatherService.getCurrentTemp();
                     // Check if any of these values are unavailable
                     if (desiredTemp > -99 && currentTemp > -99 && outSideTemp > -99) {

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

@@ -19,7 +19,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         this._temperaturCallbacks = [];
         this._seasonTurnOff = false;
         this._temperatur = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
-        this._humidity = 0;
+        this._humidity = baseDeviceInterfaces_1.UNDEFINED_HUMIDITY_VALUE;
         this._desiredTemperatur = 0;
         this._roomTemperatur = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this._setPointTemperaturID = `${this.info.fullID}.1.SET_POINT_TEMPERATURE`;

package/lib/server/devices/zigbee/zigbeeSonoffTemp.js

@@ -9,7 +9,7 @@ class ZigbeeSonoffTemp extends BaseDevices_1.ZigbeeDevice {
         super(pInfo, deviceType_1.DeviceType.ZigbeeSonoffTemp);
         this._humidityCallbacks = [];
         this._temperaturCallbacks = [];
-        this._humidity = -99;
+        this._humidity = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this._temperatur = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
     }
     get humidity() {

package/lib/server/services/Telegram/telegram-Commands.js

@@ -69,7 +69,7 @@ class TelegramCommands {
         telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('HeizungCheck', /\/check_temperatur/, async (m) => {
             if (m.from === undefined)
                 return false;
-            telegram_service_1.TelegramService.sendMessage([m.chat.id], devices_1.Heizgruppen.getInfo());
+            telegram_service_1.TelegramService.sendMessage([m.chat.id], devices_1.HeatGroup.getInfo());
             return true;
         }, 'Gibt die Namen und aktuellen Werte sämtlicher Heizgruppen aus (aktuelle Temperatur, Soll Temperatur, Ventilstellung).'));
         telegram_service_1.TelegramService.addMessageCallback(new telegramMessageCalback_1.TelegramMessageCallback('HeizungError', /\/temperatur_error/, async (m) => {

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

@@ -1,20 +1,23 @@
 import { iExcessEnergyConsumer } from '../../devices';
-import { ExcessEnergyConsumerSettings, LogLevel } from '../../../models';
+import { ExcessEnergyConsumerSettings, LogLevel, RoomBase } from '../../../models';
 import { AcMode } from './ac-mode';
 import { AcSettings } from '../../../models/deviceSettings/acSettings';
+import { AcDeviceType } from './acDeviceType';
 export declare abstract class AcDevice implements iExcessEnergyConsumer {
     name: string;
     roomName: string;
     ip: string;
+    acDeviceType: AcDeviceType;
     currentConsumption: number;
     energyConsumerSettings: ExcessEnergyConsumerSettings;
     acSettings: AcSettings;
+    room: RoomBase | undefined;
     protected _activatedByExcessEnergy: boolean;
     protected _blockAutomaticTurnOnMS: number;
-    private turnOffTimeout;
-    protected constructor(name: string, roomName: string, ip: string);
+    protected constructor(name: string, roomName: string, ip: string, acDeviceType: AcDeviceType);
     abstract get on(): boolean;
     isAvailableForExcessEnergy(): boolean;
+    calculateDesiredMode(): AcMode;
     /**
      * Disable automatic Turn-On for given amount of ms and turn off immediately.
      * @param {number} timeout
@@ -27,4 +30,5 @@ export declare abstract class AcDevice implements iExcessEnergyConsumer {
     turnOffDueToMissingEnergy(): void;
     log(level: LogLevel, message: string): void;
     wasActivatedByExcessEnergy(): boolean;
+    private automaticCheck;
 }

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

@@ -4,18 +4,20 @@ exports.AcDevice = void 0;
 const models_1 = require("../../../models");
 const utils_1 = require("../utils");
 const log_service_1 = require("../log-service");
+const ac_mode_1 = require("./ac-mode");
 const acSettings_1 = require("../../../models/deviceSettings/acSettings");
 class AcDevice {
-    constructor(name, roomName, ip) {
+    constructor(name, roomName, ip, acDeviceType) {
         this.name = name;
         this.roomName = roomName;
         this.ip = ip;
+        this.acDeviceType = acDeviceType;
         this.currentConsumption = -1;
         this.energyConsumerSettings = new models_1.ExcessEnergyConsumerSettings();
         this.acSettings = new acSettings_1.AcSettings();
         this._activatedByExcessEnergy = false;
         this._blockAutomaticTurnOnMS = -1;
-        this.turnOffTimeout = null;
+        utils_1.Utils.guardedInterval(this.automaticCheck, 60000, this, true);
     }
     isAvailableForExcessEnergy() {
         if (utils_1.Utils.nowMS() < this._blockAutomaticTurnOnMS) {
@@ -24,7 +26,25 @@ class AcDevice {
         const minimumStart = utils_1.Utils.dateByTimeSpan(this.acSettings.minimumHours, this.acSettings.minimumMinutes);
         const maximumEnd = utils_1.Utils.dateByTimeSpan(this.acSettings.maximumHours, this.acSettings.maximumMinutes);
         const now = new Date();
-        return !(now < minimumStart || now > maximumEnd);
+        if (now < minimumStart || now > maximumEnd) {
+            return false;
+        }
+        return this.calculateDesiredMode() !== ac_mode_1.AcMode.Off;
+    }
+    calculateDesiredMode() {
+        var _a, _b;
+        const temp = (_b = (_a = this.room) === null || _a === void 0 ? void 0 : _a.HeatGroup) === null || _b === void 0 ? void 0 : _b.temperature;
+        if (temp === undefined) {
+            this.log(models_1.LogLevel.Warn, `Can't calculate AC Mode as we have no room temperature`);
+            return ac_mode_1.AcMode.Off;
+        }
+        if (temp > this.acSettings.stopCoolingTemperatur) {
+            return ac_mode_1.AcMode.Cooling;
+        }
+        if (temp < this.acSettings.stopHeatingTemperatur && this.acSettings.heatingAllowed) {
+            return ac_mode_1.AcMode.Heating;
+        }
+        return ac_mode_1.AcMode.Off;
     }
     /**
      * Disable automatic Turn-On for given amount of ms and turn off immediately.
@@ -39,14 +59,8 @@ class AcDevice {
             return;
         }
         this._activatedByExcessEnergy = true;
+        this.setDesiredMode(this.calculateDesiredMode(), false);
         this.turnOn();
-        if (this.acSettings.maximumHours < 24 && this.turnOffTimeout === null) {
-            this.turnOffTimeout = utils_1.Utils.guardedTimeout(() => {
-                if (this._activatedByExcessEnergy) {
-                    this.turnOff();
-                }
-            }, Math.min(utils_1.Utils.dateByTimeSpan(this.acSettings.maximumHours, this.acSettings.maximumMinutes).getTime() - utils_1.Utils.nowMS(), 1000), this);
-        }
     }
     turnOffDueToMissingEnergy() {
         this.turnOff();
@@ -57,5 +71,17 @@ class AcDevice {
     wasActivatedByExcessEnergy() {
         return this._activatedByExcessEnergy;
     }
+    automaticCheck() {
+        if (!this.on) {
+            return;
+        }
+        const desiredMode = this.calculateDesiredMode();
+        const maximumEnd = utils_1.Utils.dateByTimeSpan(this.acSettings.maximumHours, this.acSettings.maximumMinutes);
+        const now = new Date();
+        if (now > maximumEnd || (this._activatedByExcessEnergy && desiredMode == ac_mode_1.AcMode.Off)) {
+            this.turnOff();
+            return;
+        }
+    }
 }
 exports.AcDevice = AcDevice;

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

@@ -1,5 +1,6 @@
 export declare enum AcMode {
-    Auto = 0,
-    Cooling = 1,
-    Heating = 2
+    Off = 0,
+    Auto = 1,
+    Cooling = 2,
+    Heating = 3
 }

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

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AcMode = void 0;
 var AcMode;
 (function (AcMode) {
-    AcMode[AcMode["Auto"] = 0] = "Auto";
-    AcMode[AcMode["Cooling"] = 1] = "Cooling";
-    AcMode[AcMode["Heating"] = 2] = "Heating";
+    AcMode[AcMode["Off"] = 0] = "Off";
+    AcMode[AcMode["Auto"] = 1] = "Auto";
+    AcMode[AcMode["Cooling"] = 2] = "Cooling";
+    AcMode[AcMode["Heating"] = 3] = "Heating";
 })(AcMode = exports.AcMode || (exports.AcMode = {}));

package/lib/server/services/ac/acDeviceType.d.ts

@@ -0,0 +1,4 @@
+export declare enum AcDeviceType {
+    Unknown = 0,
+    Daikin = 1
+}

package/lib/server/services/ac/acDeviceType.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AcDeviceType = void 0;
+var AcDeviceType;
+(function (AcDeviceType) {
+    AcDeviceType[AcDeviceType["Unknown"] = 0] = "Unknown";
+    AcDeviceType[AcDeviceType["Daikin"] = 1] = "Daikin";
+})(AcDeviceType = exports.AcDeviceType || (exports.AcDeviceType = {}));

package/lib/server/services/ac/daikin-service.d.ts

@@ -1,5 +1,5 @@
 import { DaikinAC, DaikinManager } from 'daikin-controller';
-import { OwnDaikinDevice } from './own-daikin-device';
+import { AcDevice } from './ac-device';
 export declare class DaikinService {
     private static _ownDevices;
     private static _daikinManager;
@@ -7,7 +7,7 @@ export declare class DaikinService {
     private static _isInitialized;
     static get isInitialized(): boolean;
     static addOwnDevices(daikinDevices: {
-        [name: string]: OwnDaikinDevice;
+        [name: string]: AcDevice;
     }): void;
     static getDevice(name: string): DaikinAC | undefined;
     static initialize(): Promise<void>;

package/lib/server/services/ac/daikin-service.js

@@ -9,6 +9,7 @@ const settings_service_1 = require("../settings-service");
 const devices_1 = require("../../devices");
 const network_1 = require("../network");
 const utils_1 = require("../utils");
+const acDeviceType_1 = require("./acDeviceType");
 class DaikinService {
     static get daikinManager() {
         return this._daikinManager;
@@ -17,7 +18,14 @@ class DaikinService {
         return this._isInitialized;
     }
     static addOwnDevices(daikinDevices) {
-        this._ownDevices = daikinDevices;
+        const toAdd = {};
+        for (const name in daikinDevices) {
+            const d = daikinDevices[name];
+            if (d.acDeviceType == acDeviceType_1.AcDeviceType.Daikin) {
+                toAdd[name] = d;
+            }
+        }
+        this._ownDevices = toAdd;
     }
     static getDevice(name) {
         return this.daikinManager.devices[name];