hoffmation-base 3.2.5 → 3.2.7

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',
         ]);

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

@@ -48,6 +48,11 @@ export interface iAcSettings extends iDeviceSettings {
      *
      */
     minOutdoorTempForCooling: number;
+    /**
+     * Set's a specific override temperature as cooling target (e.g. to maximize cooling)
+     * -1 = Off
+     */
+    overrideCoolingTargetTemp?: number;
     /**
      *
      */

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

@@ -168,6 +168,9 @@ class AcDevice extends devices_1.RoomBaseDevice {
                 return enums_1.AcMode.Heating;
             }
             else if (this.coolingAllowed) {
+                if (this.settings.overrideCoolingTargetTemp > 0) {
+                    this._desiredTemperatur = this.settings.overrideCoolingTargetTemp;
+                }
                 return enums_1.AcMode.Cooling;
             }
             return enums_1.AcMode.Off;

package/lib/services/ac/own-daikin-device.js

@@ -111,7 +111,12 @@ class OwnDaikinDevice extends ac_device_1.AcDevice {
             targetTemp = this.settings.useOwnTemperature ? targetTemp : 29;
         }
         else if (this.desiredMode == daikin_controller_1.Mode.COLD) {
-            targetTemp = this.settings.useOwnTemperature ? targetTemp : 16;
+            if (this.settings.useOwnTemperature) {
+                targetTemp = this.settings.overrideCoolingTargetTemp > 0 ? this.settings.overrideCoolingTargetTemp : targetTemp;
+            }
+            else {
+                targetTemp = 16;
+            }
         }
         const changeObject = {
             power: this.desiredState,

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

@@ -44,6 +44,8 @@ export declare class AcSettings extends DeviceSettings implements iAcSettings {
      * The minimum outside temperature (max. of day)  in Celsius to even consider cooling.
      */
     minOutdoorTempForCooling: number;
+    /** @inheritDoc */
+    overrideCoolingTargetTemp: number;
     fromPartialObject(data: Partial<AcSettings>): void;
     toJSON(): Partial<AcSettings>;
 }

package/lib/settingsObjects/deviceSettings/acSettings.js

@@ -50,9 +50,11 @@ class AcSettings extends deviceSettings_1.DeviceSettings {
          * The minimum outside temperature (max. of day)  in Celsius to even consider cooling.
          */
         this.minOutdoorTempForCooling = 21;
+        /** @inheritDoc */
+        this.overrideCoolingTargetTemp = -1;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         this.minimumHours = (_a = data.minimumHours) !== null && _a !== void 0 ? _a : this.minimumHours;
         this.minimumMinutes = (_b = data.minimumMinutes) !== null && _b !== void 0 ? _b : this.minimumMinutes;
         this.maximumHours = (_c = data.maximumHours) !== null && _c !== void 0 ? _c : this.maximumHours;
@@ -63,6 +65,7 @@ class AcSettings extends deviceSettings_1.DeviceSettings {
         this.useAutomatic = (_h = data.useAutomatic) !== null && _h !== void 0 ? _h : this.useAutomatic;
         this.manualDisabled = (_j = data.manualDisabled) !== null && _j !== void 0 ? _j : this.manualDisabled;
         this.minOutdoorTempForCooling = (_k = data.minOutdoorTempForCooling) !== null && _k !== void 0 ? _k : this.minOutdoorTempForCooling;
+        this.overrideCoolingTargetTemp = (_l = data.overrideCoolingTargetTemp) !== null && _l !== void 0 ? _l : this.overrideCoolingTargetTemp;
         super.fromPartialObject(data);
     }
     toJSON() {