hoffmation-base 2.4.6 → 2.5.0

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

@@ -1,5 +1,8 @@
 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;
@@ -33,4 +36,6 @@ 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,6 +6,7 @@ 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;
@@ -39,20 +40,39 @@ class HeaterSettings extends deviceSettings_1.DeviceSettings {
         this.pidForcedMinimum = 1;
     }
     fromPartialObject(data) {
-        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;
+        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;
         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/temperatureSettings.d.ts

@@ -3,10 +3,9 @@ export declare class TemperatureSettings {
     start: Daytime;
     end: Daytime;
     temperature: number;
+    name: string;
     active: boolean;
-    constructor(start: Daytime, end: Daytime, temperature: number, active?: boolean);
-    static getActiveSetting(settings: {
-        [name: string]: TemperatureSettings;
-    }, date: Date): TemperatureSettings | undefined;
+    constructor(start: Daytime, end: Daytime, temperature: number, name: string, active?: boolean);
+    static getActiveSetting(settings: TemperatureSettings[], date: Date): TemperatureSettings | undefined;
     isNowInRange(date: Date): boolean;
 }

package/lib/models/temperatureSettings.js

@@ -2,18 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TemperatureSettings = void 0;
 class TemperatureSettings {
-    constructor(start, end, temperature, active = true) {
+    constructor(start, end, temperature, name, active = true) {
         this.start = start;
         this.end = end;
         this.temperature = temperature;
+        this.name = name;
         this.active = active;
     }
     static getActiveSetting(settings, date) {
-        for (const name of Object.keys(settings)) {
-            if (settings[name] === undefined) {
-                continue;
-            }
-            const setting = settings[name];
+        for (const setting of settings) {
             if (setting.isNowInRange(date)) {
                 return setting;
             }

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

@@ -11,7 +11,7 @@ export interface iHeater extends iRoomDevice {
     readonly persistHeaterInterval: NodeJS.Timeout;
     seasonTurnOff: boolean;
     deleteAutomaticPoint(name: string): void;
-    setAutomaticPoint(name: string, setting: TemperatureSettings): void;
+    setAutomaticPoint(setting: TemperatureSettings): void;
     stopAutomaticCheck(): void;
     checkAutomaticChange(): void;
     onTemperaturChange(newTemperatur: number): void;

package/lib/server/devices/hmIPDevices/hmIpHeizgruppe.d.ts

@@ -14,7 +14,6 @@ export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSe
     private _initialSeasonCheckDone;
     private _level;
     private _setPointTemperatureID;
-    private _automaticPoints;
     private _humidityCallbacks;
     private _temperatureCallbacks;
     constructor(pInfo: IoBrokerDeviceInfo);
@@ -39,8 +38,8 @@ export declare class HmIpHeizgruppe extends HmIPDevice implements iTemperatureSe
     set roomTemperature(value: number);
     addHumidityCallback(pCallback: (pValue: number) => void): void;
     deleteAutomaticPoint(name: string): void;
+    setAutomaticPoint(setting: TemperatureSettings): void;
     getBelongingHeizungen(): iHeater[];
-    setAutomaticPoint(name: string, setting: TemperatureSettings): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     stopAutomaticCheck(): void;
     checkAutomaticChange(): void;

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

@@ -24,7 +24,6 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         this._initialSeasonCheckDone = false;
         this._level = 0;
         this._setPointTemperatureID = '';
-        this._automaticPoints = {};
         this._humidityCallbacks = [];
         this._temperatureCallbacks = [];
         this._seasonTurnOff = false;
@@ -109,8 +108,10 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         }
     }
     deleteAutomaticPoint(name) {
-        if (this._automaticPoints[name] !== undefined)
-            delete this._automaticPoints[name];
+        this.settings.deleteAutomaticPoint(name, this);
+    }
+    setAutomaticPoint(setting) {
+        this.settings.setAutomaticPoint(setting, this);
     }
     getBelongingHeizungen() {
         if (!this.room) {
@@ -118,9 +119,6 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         }
         return this.room.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Heater);
     }
-    setAutomaticPoint(name, setting) {
-        this._automaticPoints[name] = setting;
-    }
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Heizgruppe Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
@@ -144,7 +142,7 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         if (!this.settings.automaticMode || this.seasonTurnOff) {
             return;
         }
-        const setting = models_1.TemperatureSettings.getActiveSetting(this._automaticPoints, new Date());
+        const setting = models_1.TemperatureSettings.getActiveSetting(this.settings.automaticPoints, new Date());
         if (setting === undefined) {
             this.log(models_1.LogLevel.Warn, `Undefined Heating Timestamp.`);
             this.desiredTemperature = this.settings.automaticFallBackTemperatur;

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

@@ -40,7 +40,7 @@ export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater, iBatt
     set roomTemperatur(val: number);
     checkAutomaticChange(): void;
     deleteAutomaticPoint(name: string): void;
-    setAutomaticPoint(name: string, setting: TemperatureSettings): void;
+    setAutomaticPoint(setting: TemperatureSettings): void;
     stopAutomaticCheck(): void;
     onTemperaturChange(newTemperatur: number): void;
     persistHeater(): void;

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

@@ -98,7 +98,7 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         if (!this.settings.automaticMode || this.seasonTurnOff) {
             return;
         }
-        const setting = models_1.TemperatureSettings.getActiveSetting(this._automaticPoints, new Date());
+        const setting = models_1.TemperatureSettings.getActiveSetting(this.settings.automaticPoints, new Date());
         if (setting === undefined) {
             this.log(models_1.LogLevel.Warn, `Undefined Heating Timestamp.`);
             this.desiredTemperature = this.settings.automaticFallBackTemperatur;
@@ -110,11 +110,10 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         }
     }
     deleteAutomaticPoint(name) {
-        if (this._automaticPoints[name] !== undefined)
-            delete this._automaticPoints[name];
+        this.settings.deleteAutomaticPoint(name, this);
     }
-    setAutomaticPoint(name, setting) {
-        this._automaticPoints[name] = setting;
+    setAutomaticPoint(setting) {
+        this.settings.setAutomaticPoint(setting, this);
     }
     stopAutomaticCheck() {
         if (this._iAutomaticInterval !== undefined) {