hoffmation-base 2.19.0 → 2.19.2

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

@@ -30,6 +30,11 @@ export declare class HeaterSettings extends DeviceSettings {
      * @type {number}
      */
     pidForcedMinimum: number;
+    /**
+     * Whether this AC should be turned off for some time manually
+     * @type {boolean}
+     */
+    manualDisabled: boolean;
     fromPartialObject(data: Partial<HeaterSettings>): void;
     protected toJSON(): Partial<HeaterSettings>;
 }

package/lib/models/deviceSettings/heaterSettings.js

@@ -36,9 +36,14 @@ class HeaterSettings extends deviceSettings_1.DeviceSettings {
          * @type {number}
          */
         this.pidForcedMinimum = 1;
+        /**
+         * Whether this AC should be turned off for some time manually
+         * @type {boolean}
+         */
+        this.manualDisabled = false;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         this.automaticMode = (_a = data.automaticMode) !== null && _a !== void 0 ? _a : this.automaticMode;
         this.useOwnTemperatur = (_b = data.useOwnTemperatur) !== null && _b !== void 0 ? _b : this.useOwnTemperatur;
         this.controlByPid = (_c = data.controlByPid) !== null && _c !== void 0 ? _c : this.controlByPid;
@@ -47,6 +52,7 @@ class HeaterSettings extends deviceSettings_1.DeviceSettings {
         this.seasonTurnOffDay = (_f = data.seasonTurnOffDay) !== null && _f !== void 0 ? _f : this.seasonTurnOffDay;
         this.seasonTurnOnDay = (_g = data.seasonTurnOnDay) !== null && _g !== void 0 ? _g : this.seasonTurnOnDay;
         this.pidForcedMinimum = (_h = data.pidForcedMinimum) !== null && _h !== void 0 ? _h : this.pidForcedMinimum;
+        this.manualDisabled = (_j = data.manualDisabled) !== null && _j !== void 0 ? _j : this.manualDisabled;
         super.fromPartialObject(data);
     }
     toJSON() {

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

@@ -5,18 +5,20 @@ import { LogDebugType, OwnSonosDevice } from '../../services';
 import { iDachsSettings } from '../../config/iDachsSettings';
 import { DachsDeviceSettings } from '../../../models/deviceSettings/dachsSettings';
 import { iFlattenedCompleteResponse } from './interfaces';
-import { DachsWarmWaterTemperature } from './dachsWarmWaterTemperature';
+import { DachsTemperatureSensor } from './dachsTemperatureSensor';
 export declare class Dachs implements iBaseDevice, iActuator {
     settings: DachsDeviceSettings;
     readonly deviceType: DeviceType;
     readonly deviceCapabilities: DeviceCapability[];
-    readonly warmWaterSensor: DachsWarmWaterTemperature;
+    readonly warmWaterSensor: DachsTemperatureSensor;
+    readonly heatStorageTempSensor: DachsTemperatureSensor;
     private readonly client;
     private readonly config;
     fetchedData: iFlattenedCompleteResponse | undefined;
     private readonly _influxClient;
     private _dachsOn;
     private _tempWarmWater;
+    private _tempHeatStorage;
     get customName(): string;
     get actuatorOn(): boolean;
     get tempWarmWater(): number;

package/lib/server/devices/dachs/dachs.js

@@ -11,7 +11,7 @@ const services_1 = require("../../services");
 const lodash_1 = __importDefault(require("lodash"));
 const dachsSettings_1 = require("../../../models/deviceSettings/dachsSettings");
 const lib_1 = require("./lib");
-const dachsWarmWaterTemperature_1 = require("./dachsWarmWaterTemperature");
+const dachsTemperatureSensor_1 = require("./dachsTemperatureSensor");
 class Dachs {
     get customName() {
         return this.info.customName;
@@ -28,6 +28,7 @@ class Dachs {
         this.deviceCapabilities = [];
         this._dachsOn = false;
         this._tempWarmWater = 0;
+        this._tempHeatStorage = 0;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.actuator);
         this._info = new devices_1.DeviceInfo();
         this._info.fullName = `Dachs`;
@@ -46,7 +47,8 @@ class Dachs {
         };
         this.config = modifiedOptions;
         this.client = new lib_1.DachsHttpClient(this.config.connectionOptions);
-        this.warmWaterSensor = new dachsWarmWaterTemperature_1.DachsWarmWaterTemperature(this.config.roomName);
+        this.warmWaterSensor = new dachsTemperatureSensor_1.DachsTemperatureSensor(this.config.roomName, 'ww', 'Water Temperature');
+        this.heatStorageTempSensor = new dachsTemperatureSensor_1.DachsTemperatureSensor(this.config.roomName, 'hs', 'Heat Storage Temperature');
         services_1.Utils.guardedInterval(this.loadData, this.config.refreshInterval, this);
     }
     get info() {
@@ -74,7 +76,7 @@ class Dachs {
         });
     }
     toJSON() {
-        return services_1.Utils.jsonFilter(lodash_1.default.omit(this, ['room', 'client', 'config', '_influxClient', 'warmWaterSensor']));
+        return services_1.Utils.jsonFilter(lodash_1.default.omit(this, ['room', 'client', 'config', '_influxClient', 'warmWaterSensor', 'heatStorageTempSensor']));
     }
     persistDeviceInfo() {
         services_1.Utils.guardedTimeout(() => {
@@ -87,7 +89,7 @@ class Dachs {
     }
     loadData() {
         this.client.fetchAllKeys().then((data) => {
-            var _a;
+            var _a, _b;
             this.fetchedData = data;
             if (this._influxClient === undefined) {
                 return;
@@ -104,6 +106,8 @@ class Dachs {
             this._dachsOn = this.fetchedData['Hka_Mw1.usDrehzahl'] >= 1;
             this._tempWarmWater = (_a = this.fetchedData['Hka_Mw1.Temp.sbZS_Warmwasser']) !== null && _a !== void 0 ? _a : 0;
             this.warmWaterSensor.update(this._tempWarmWater);
+            this._tempHeatStorage = (_b = this.fetchedData['Hka_Mw1.Temp.sbFuehler1']) !== null && _b !== void 0 ? _b : 0;
+            this.heatStorageTempSensor.update(this._tempHeatStorage);
             this.persist();
         });
     }

package/lib/server/devices/dachs/{dachsWarmWaterTemperature.d.ts → dachsTemperatureSensor.d.ts}

@@ -5,7 +5,7 @@ import { DeviceCapability } from '../DeviceCapability';
 import { DeviceType } from '../deviceType';
 import { DeviceInfo } from '../DeviceInfo';
 import { DeviceSettings, LogLevel, RoomBase } from '../../../models';
-export declare class DachsWarmWaterTemperature implements iTemperatureSensor {
+export declare class DachsTemperatureSensor implements iTemperatureSensor {
     settings: DeviceSettings | undefined;
     readonly deviceType: DeviceType;
     readonly deviceCapabilities: DeviceCapability[];
@@ -13,7 +13,7 @@ export declare class DachsWarmWaterTemperature implements iTemperatureSensor {
     private _temperaturCallbacks;
     private _roomTemperature;
     protected _info: DeviceInfo;
-    constructor(roomName: string);
+    constructor(roomName: string, shortKey: string, longKey: string);
     get customName(): string;
     get info(): DeviceInfo;
     set info(info: DeviceInfo);

package/lib/server/devices/dachs/{dachsWarmWaterTemperature.js → dachsTemperatureSensor.js}

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DachsWarmWaterTemperature = void 0;
+exports.DachsTemperatureSensor = void 0;
 const baseDeviceInterfaces_1 = require("../baseDeviceInterfaces");
 const services_1 = require("../../services");
 const DeviceCapability_1 = require("../DeviceCapability");
@@ -11,8 +11,8 @@ const deviceType_1 = require("../deviceType");
 const DeviceInfo_1 = require("../DeviceInfo");
 const devices_1 = require("../devices");
 const lodash_1 = __importDefault(require("lodash"));
-class DachsWarmWaterTemperature {
-    constructor(roomName) {
+class DachsTemperatureSensor {
+    constructor(roomName, shortKey, longKey) {
         this.settings = undefined;
         this.deviceType = deviceType_1.DeviceType.DachsWarmWaterTemperature;
         this.deviceCapabilities = [];
@@ -24,9 +24,9 @@ class DachsWarmWaterTemperature {
         this._temperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.temperatureSensor);
         this._info = new DeviceInfo_1.DeviceInfo();
-        this._info.fullName = `Water Temperature`;
-        this._info.customName = `Water Temperature ${roomName}`;
-        this._info.allDevicesKey = `dachs-ww-${roomName}`;
+        this._info.fullName = longKey;
+        this._info.customName = `${longKey} ${roomName}`;
+        this._info.allDevicesKey = `dachs-${shortKey}-${roomName}`;
         this._info.room = roomName;
         devices_1.Devices.alLDevices[this._info.allDevicesKey] = this;
         devices_1.Devices.temperatureWarmWater = this;
@@ -44,7 +44,7 @@ class DachsWarmWaterTemperature {
     }
     get id() {
         var _a;
-        return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `sonos-${this.info.room}-${this.info.customName}`;
+        return (_a = this.info.allDevicesKey) !== null && _a !== void 0 ? _a : `dachs-${this.info.room}-${this.info.customName}`;
     }
     get name() {
         return this.info.customName;
@@ -113,4 +113,4 @@ class DachsWarmWaterTemperature {
         }
     }
 }
-exports.DachsWarmWaterTemperature = DachsWarmWaterTemperature;
+exports.DachsTemperatureSensor = DachsTemperatureSensor;

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

@@ -130,6 +130,10 @@ class HmIpHeizgruppe extends hmIpDevice_1.HmIPDevice {
         if (!this._initialSeasonCheckDone) {
             this.checkSeasonTurnOff();
         }
+        if (this.seasonTurnOff || this.settings.manualDisabled) {
+            this.seasonTurnOff = true;
+            return;
+        }
         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;

package/lib/server/devices/shelly/shellyTrv.js

@@ -126,7 +126,9 @@ class ShellyTrv extends shellyDevice_1.ShellyDevice {
         if (!this._initialSeasonCheckDone) {
             this.checkSeasonTurnOff();
         }
-        if (this.seasonTurnOff) {
+        if (this.seasonTurnOff || this.settings.manualDisabled) {
+            this.setValve(0);
+            this.setMode(false);
             return;
         }
         if (this.settings.pidForcedMinimum !== this.minimumLevel) {

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

@@ -96,6 +96,10 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
             this.checkSeasonTurnOff();
         }
         const heatGroup = this.room.HeatGroup;
+        if (this.seasonTurnOff || this.settings.manualDisabled) {
+            this.desiredTemperature = 0;
+            return;
+        }
         if (!this.settings.automaticMode || this.seasonTurnOff || ((_a = heatGroup === null || heatGroup === void 0 ? void 0 : heatGroup.settings) === null || _a === void 0 ? void 0 : _a.automaticMode) === false) {
             return;
         }

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

@@ -102,6 +102,11 @@ class ZigbeeEuroHeater extends BaseDevices_1.ZigbeeHeater {
         super.update(idSplit, state, initial, true);
     }
     recalcLevel() {
+        if (this.seasonTurnOff || this.settings.manualDisabled) {
+            this.setValve(0);
+            this.setMode(1);
+            return;
+        }
         if (this.settings.useOwnTemperatur || this.seasonTurnOff) {
             return;
         }