hoffmation-base 3.2.4 → 3.2.6

package/lib/devices/BaseDevice.d.ts

@@ -9,6 +9,8 @@ export declare abstract class BaseDevice implements iBaseDevice {
     /** @inheritDoc */
     readonly jsonOmitKeys: string[];
     /** @inheritDoc */
+    readonly jsonOmitTopLevelKeys: string[];
+    /** @inheritDoc */
     readonly deviceCapabilities: DeviceCapability[];
     /**
      * @inheritDoc

package/lib/devices/BaseDevice.js

@@ -16,6 +16,8 @@ class BaseDevice {
         /** @inheritDoc */
         this.jsonOmitKeys = [];
         /** @inheritDoc */
+        this.jsonOmitTopLevelKeys = [];
+        /** @inheritDoc */
         this.deviceCapabilities = [];
         /**
          * @inheritDoc
@@ -95,7 +97,7 @@ class BaseDevice {
         // eslint-disable-next-line
         const returnValue = lodash_1.default.omit(this, 'lastCommands');
         returnValue['lastCommands'] = this.lastCommands.readAmount(this.lastCommands.maximumSize);
-        return utils_1.Utils.jsonFilter(returnValue, this.jsonOmitKeys);
+        return utils_1.Utils.jsonFilter(returnValue, this.jsonOmitKeys, this.jsonOmitTopLevelKeys);
     }
 }
 exports.BaseDevice = BaseDevice;

package/lib/devices/dachs/dachs.js

@@ -52,14 +52,13 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
          * The timestamp of the last time the Block was enforced.
          */
         this._blockStarted = 0;
+        this.jsonOmitTopLevelKeys.push(...['warmWaterPump', 'heatingRod']);
         this.jsonOmitKeys.push(...[
             'client',
             'config',
             '_influxClient',
             'warmWaterSensor',
             'heatStorageTempSensor',
-            'warmWaterPump',
-            'heatingRod',
             'blockDachsStart',
             'warmWaterDachsAlternativeActuator',
         ]);
@@ -269,10 +268,11 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
         if (this.heatingRod === undefined) {
             return;
         }
-        const shouldBeOff = batteryLevel < this.settings.batteryLevelHeatingRodThreshold &&
-            !(settings_service_1.SettingsService.heatMode === enums_1.HeatingMode.Winter &&
-                batteryLevel > this.settings.batteryLevelPreventStartThreshold &&
-                this.heatStorageTempSensor.temperatureSensor.temperature < 60);
+        const shouldBeOff = this.settings.disableHeatingRod ||
+            (batteryLevel < this.settings.batteryLevelHeatingRodThreshold &&
+                !(settings_service_1.SettingsService.heatMode === enums_1.HeatingMode.Winter &&
+                    batteryLevel > this.settings.batteryLevelPreventStartThreshold &&
+                    this.heatStorageTempSensor.temperatureSensor.temperature < 60));
         if (this.heatingRod.actuatorOn !== shouldBeOff) {
             return;
         }

package/lib/interfaces/deviceSettings/iDachsDeviceSettings.d.ts

@@ -7,6 +7,10 @@ export interface iDachsDeviceSettings extends iActuatorSettings {
      * The refresh interval in ms to pull the data from the device.
      */
     refreshIntervalTime: number;
+    /**
+     * Whether the secondary water heating source should be disabled regardless of battery level.
+     */
+    disableHeatingRod: boolean;
     /**
      * Defines the battery level at which the dachs should be turned on,
      * to prevent a battery based island-system to be out of power.

package/lib/interfaces/settings/iShutterSettings.d.ts

@@ -19,6 +19,18 @@ export interface iShutterSettings extends iDeviceSettings {
      *
      */
     heatReductionPosition: number;
+    /**
+     * The minimum temperature in degree celsius, to trigger heat reduction, when the sun is shining on window.
+     * @type {number}
+     * @default 24
+     */
+    heatReductionDirectionThreshold: number;
+    /**
+     * The minimum temperature in degree celsius, to trigger heat reduction regardless of direction
+     * @type {number}
+     * @default 27
+     */
+    heatReductionThreshold: number;
     /**
      *
      */

package/lib/services/weather/weather-service.js

@@ -155,6 +155,9 @@ class WeatherService {
             logger(enums_1.LogLevel.Trace, "RolloWeatherPosition: It's close to or after todays sunset");
             return result;
         }
+        else if (this.willOutsideBeWarmer(shutterSettings.heatReductionThreshold, logger)) {
+            result = shutterSettings.heatReductionPosition;
+        }
         else if (shutterSettings.direction !== undefined &&
             !utils_1.Utils.degreeInBetween(shutterSettings.direction - 50, shutterSettings.direction + 50, this.sunDirection)) {
             logger(enums_1.LogLevel.Trace, 'RolloWeatherPosition: Sun is facing a different direction');
@@ -163,7 +166,7 @@ class WeatherService {
         else if (this.getCurrentCloudiness() > 40) {
             logger(enums_1.LogLevel.Trace, 'RolloWeatherPosition: It´s cloudy now.');
         }
-        else if (this.willOutsideBeWarmer(26, logger)) {
+        else if (this.willOutsideBeWarmer(shutterSettings.heatReductionDirectionThreshold, logger)) {
             result = shutterSettings.heatReductionPosition;
         }
         if (result !== normalPos) {

package/lib/settingsObjects/deviceSettings/dachsSettings.d.ts

@@ -4,6 +4,8 @@ export declare class DachsDeviceSettings extends ActuatorSettings implements iDa
     /** @inheritDoc */
     refreshIntervalTime: number;
     /** @inheritDoc */
+    disableHeatingRod: boolean;
+    /** @inheritDoc */
     batteryLevelTurnOnThreshold: number;
     /** @inheritDoc */
     batteryLevelBeforeNightTurnOnThreshold: number;

package/lib/settingsObjects/deviceSettings/dachsSettings.js

@@ -9,6 +9,8 @@ class DachsDeviceSettings extends actuatorSettings_1.ActuatorSettings {
         /** @inheritDoc */
         this.refreshIntervalTime = 30000;
         /** @inheritDoc */
+        this.disableHeatingRod = false;
+        /** @inheritDoc */
         this.batteryLevelTurnOnThreshold = -1;
         /** @inheritDoc */
         this.batteryLevelBeforeNightTurnOnThreshold = -1;
@@ -28,21 +30,22 @@ class DachsDeviceSettings extends actuatorSettings_1.ActuatorSettings {
         this.winterMinimumPreNightHeatStorageTemp = 65;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-        this.refreshIntervalTime = (_a = data.refreshIntervalTime) !== null && _a !== void 0 ? _a : this.refreshIntervalTime;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        this.disableHeatingRod = (_a = data.disableHeatingRod) !== null && _a !== void 0 ? _a : this.disableHeatingRod;
+        this.refreshIntervalTime = (_b = data.refreshIntervalTime) !== null && _b !== void 0 ? _b : this.refreshIntervalTime;
         this.batteryLevelBeforeNightTurnOnThreshold =
-            (_b = data.batteryLevelBeforeNightTurnOnThreshold) !== null && _b !== void 0 ? _b : this.batteryLevelBeforeNightTurnOnThreshold;
-        this.batteryLevelTurnOnThreshold = (_c = data.batteryLevelTurnOnThreshold) !== null && _c !== void 0 ? _c : this.batteryLevelTurnOnThreshold;
-        this.batteryLevelHeatingRodThreshold = (_d = data.batteryLevelHeatingRodThreshold) !== null && _d !== void 0 ? _d : this.batteryLevelHeatingRodThreshold;
+            (_c = data.batteryLevelBeforeNightTurnOnThreshold) !== null && _c !== void 0 ? _c : this.batteryLevelBeforeNightTurnOnThreshold;
+        this.batteryLevelTurnOnThreshold = (_d = data.batteryLevelTurnOnThreshold) !== null && _d !== void 0 ? _d : this.batteryLevelTurnOnThreshold;
+        this.batteryLevelHeatingRodThreshold = (_e = data.batteryLevelHeatingRodThreshold) !== null && _e !== void 0 ? _e : this.batteryLevelHeatingRodThreshold;
         this.batteryLevelPreventStartThreshold =
-            (_e = data.batteryLevelPreventStartThreshold) !== null && _e !== void 0 ? _e : this.batteryLevelPreventStartThreshold;
+            (_f = data.batteryLevelPreventStartThreshold) !== null && _f !== void 0 ? _f : this.batteryLevelPreventStartThreshold;
         this.batteryLevelPreventStartAtNightThreshold =
-            (_f = data.batteryLevelPreventStartAtNightThreshold) !== null && _f !== void 0 ? _f : this.batteryLevelPreventStartAtNightThreshold;
-        this.batteryLevelAllowStartThreshold = (_g = data.batteryLevelAllowStartThreshold) !== null && _g !== void 0 ? _g : this.batteryLevelAllowStartThreshold;
-        this.warmWaterDesiredMinTemp = (_h = data.warmWaterDesiredMinTemp) !== null && _h !== void 0 ? _h : this.warmWaterDesiredMinTemp;
-        this.winterMinimumHeatStorageTemp = (_j = data.winterMinimumHeatStorageTemp) !== null && _j !== void 0 ? _j : this.winterMinimumHeatStorageTemp;
+            (_g = data.batteryLevelPreventStartAtNightThreshold) !== null && _g !== void 0 ? _g : this.batteryLevelPreventStartAtNightThreshold;
+        this.batteryLevelAllowStartThreshold = (_h = data.batteryLevelAllowStartThreshold) !== null && _h !== void 0 ? _h : this.batteryLevelAllowStartThreshold;
+        this.warmWaterDesiredMinTemp = (_j = data.warmWaterDesiredMinTemp) !== null && _j !== void 0 ? _j : this.warmWaterDesiredMinTemp;
+        this.winterMinimumHeatStorageTemp = (_k = data.winterMinimumHeatStorageTemp) !== null && _k !== void 0 ? _k : this.winterMinimumHeatStorageTemp;
         this.winterMinimumPreNightHeatStorageTemp =
-            (_k = data.winterMinimumPreNightHeatStorageTemp) !== null && _k !== void 0 ? _k : this.winterMinimumPreNightHeatStorageTemp;
+            (_l = data.winterMinimumPreNightHeatStorageTemp) !== null && _l !== void 0 ? _l : this.winterMinimumPreNightHeatStorageTemp;
         super.fromPartialObject(data);
     }
     toJSON() {

package/lib/settingsObjects/deviceSettings/shutterSettings.d.ts

@@ -21,6 +21,10 @@ export declare class ShutterSettings extends DeviceSettings implements iShutterS
      * @default 40
      */
     heatReductionPosition: number;
+    /** @inheritDoc */
+    heatReductionDirectionThreshold: number;
+    /** @inheritDoc */
+    heatReductionThreshold: number;
     /**
      * Some shutter give no position feedback on their own, so by knowing the durations in either direction,
      * we can programmatically trigger the callbacks.

package/lib/settingsObjects/deviceSettings/shutterSettings.js

@@ -26,6 +26,10 @@ class ShutterSettings extends deviceSettings_1.DeviceSettings {
          * @default 40
          */
         this.heatReductionPosition = 40;
+        /** @inheritDoc */
+        this.heatReductionDirectionThreshold = 24;
+        /** @inheritDoc */
+        this.heatReductionThreshold = 27;
         /**
          * Some shutter give no position feedback on their own, so by knowing the durations in either direction,
          * we can programmatically trigger the callbacks.
@@ -34,12 +38,14 @@ class ShutterSettings extends deviceSettings_1.DeviceSettings {
         this.triggerPositionUpdateByTime = false;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         this.msTilTop = (_a = data.msTilTop) !== null && _a !== void 0 ? _a : this.msTilTop;
         this.msTilBot = (_b = data.msTilBot) !== null && _b !== void 0 ? _b : this.msTilBot;
         this.direction = (_c = data.direction) !== null && _c !== void 0 ? _c : this.direction;
         this.heatReductionPosition = (_d = data.heatReductionPosition) !== null && _d !== void 0 ? _d : this.heatReductionPosition;
-        this.triggerPositionUpdateByTime = (_e = data.triggerPositionUpdateByTime) !== null && _e !== void 0 ? _e : this.triggerPositionUpdateByTime;
+        this.heatReductionThreshold = (_e = data.heatReductionThreshold) !== null && _e !== void 0 ? _e : this.heatReductionThreshold;
+        this.heatReductionDirectionThreshold = (_f = data.heatReductionDirectionThreshold) !== null && _f !== void 0 ? _f : this.heatReductionDirectionThreshold;
+        this.triggerPositionUpdateByTime = (_g = data.triggerPositionUpdateByTime) !== null && _g !== void 0 ? _g : this.triggerPositionUpdateByTime;
         super.fromPartialObject(data);
     }
     toJSON() {