hoffmation-base 1.0.12 → 1.0.15

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/groups/heatGroup.d.ts

@@ -1,12 +1,20 @@
 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[]);
+    constructor(roomName: string, heaterIds: string[], tempSensorIds: string[], humiditySensorIds: string[], acIds: string[]);
     get currentTemp(): number;
     get desiredTemp(): number;
     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,12 +6,14 @@ 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 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));
     }
     get currentTemp() {
         if (this.getHeater().length === 0) {
@@ -43,12 +45,38 @@ class HeatGroup extends base_group_1.BaseGroup {
     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() {
         let temp = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;

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/services/ac/ac-device.d.ts

@@ -1,5 +1,5 @@
 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';
 export declare abstract class AcDevice implements iExcessEnergyConsumer {
@@ -9,12 +9,13 @@ export declare abstract class AcDevice implements iExcessEnergyConsumer {
     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);
     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 +28,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,6 +4,7 @@ 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) {
@@ -15,7 +16,7 @@ class AcDevice {
         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 +25,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.currentTemp;
+        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 +58,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 +70,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/own-daikin-device.js

@@ -91,7 +91,7 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
                     return;
                 }
                 else if (err.message.includes('ret=PARAM NG') && !retry) {
-                    this.handleParamNg();
+                    this.handleParamNg(changeObject);
                     return;
                 }
             }
@@ -113,12 +113,13 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
             }, 5000, this);
         });
     }
-    handleParamNg() {
+    handleParamNg(changeObject) {
         var _a;
-        this.log(models_1.LogLevel.Error, `Detected Param Ng for ${this.name}(${this.ip}), will try reloading Control Info`);
+        this.log(models_1.LogLevel.Error, `Detected Param Ng for ${this.name}(${this.ip}), will try reloading Control Info. Change Object: ${changeObject}`);
         (_a = this._device) === null || _a === void 0 ? void 0 : _a.getACControlInfo((err) => {
+            var _a;
             if (err === null) {
-                this.log(models_1.LogLevel.Warn, `Device Info loaded successfull will try setting Control Info again`);
+                this.log(models_1.LogLevel.Warn, `Device Info loaded successfull will try setting Control Info again: ${(_a = this._device) === null || _a === void 0 ? void 0 : _a.currentACControlInfo}`);
                 this.setDesiredInfo(true);
             }
         });