hoffmation-base 3.2.6 → 3.2.8

package/lib/devices/victron/victron-device.js

@@ -45,17 +45,28 @@ class VictronDevice extends BaseDevice_1.BaseDevice {
     }
     /** @inheritDoc */
     get acBlocked() {
-        if (this.settings.hasBattery) {
-            const hours = new Date().getHours();
-            if (hours < 6 || hours > 18) {
-                return this.batteryLevel < this.settings.minimumNightTimeAcBatteryLevel;
-            }
-            if (hours < 10 || hours > 16) {
-                return this.batteryLevel < this.settings.minimumTransientTimeAcBatteryLevel;
-            }
-            return this.batteryLevel < this.settings.minimumDayTimeAcBatteryLevel;
+        var _a;
+        if (!this.settings.hasBattery) {
+            return false;
+        }
+        const hours = new Date().getHours();
+        if (hours > 18) {
+            return this.batteryLevel < this.settings.minimumNightTimeAcBatteryLevel;
+        }
+        else if (hours > 16) {
+            return this.batteryLevel < this.settings.minimumTransientTimeAcBatteryLevel;
+        }
+        else if (hours > 5 &&
+            hours < 12 &&
+            ((_a = services_1.WeatherService.todayCloudiness) !== null && _a !== void 0 ? _a : 99) < 30 &&
+            services_1.WeatherService.todayMaxTemp > 25) {
+            // During morning hours battery still might be kinda empty but if it gets sunny again, we should go for ac anyways.
+            return this.batteryLevel > this.settings.minimumMorningSunnyDayAcBatteryLevel;
+        }
+        else if (hours < 10) {
+            return this.batteryLevel > this.settings.minimumTransientTimeAcBatteryLevel;
         }
-        return false;
+        return this.batteryLevel < this.settings.minimumDayTimeAcBatteryLevel;
     }
     /** @inheritDoc */
     get batteryLevel() {

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/services/weather/weather-service.d.ts

@@ -25,6 +25,7 @@ export declare class WeatherService {
     private static appID?;
     static addWeatherUpdateCb(name: string, cb: () => void): void;
     static get todayMaxTemp(): number;
+    static get todayCloudiness(): number | undefined;
     static initialize(config: iWeatherSettings): void;
     static update(): void;
     static stopInterval(): void;

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

@@ -20,6 +20,10 @@ class WeatherService {
         var _a, _b, _c;
         return (_c = (_b = (_a = WeatherService.lastResponse) === null || _a === void 0 ? void 0 : _a.daily[0]) === null || _b === void 0 ? void 0 : _b.temp.max) !== null && _c !== void 0 ? _c : interfaces_1.UNDEFINED_TEMP_VALUE;
     }
+    static get todayCloudiness() {
+        var _a, _b;
+        return (_b = (_a = WeatherService.lastResponse) === null || _a === void 0 ? void 0 : _a.daily[0]) === null || _b === void 0 ? void 0 : _b.clouds;
+    }
     static initialize(config) {
         this.active = true;
         this.longitude = config.longitude;

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() {

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

@@ -27,6 +27,11 @@ export declare class VictronDeviceSettings extends DeviceSettings {
      * The minimum battery level at which the system should be allowed to use AC
      */
     minimumDayTimeAcBatteryLevel: number;
+    /**
+     * The minimum battery level at which the system should be allowed to use AC on expectetly hot/sunny days mornings
+     * @type {number}
+     */
+    minimumMorningSunnyDayAcBatteryLevel: number;
     /**
      * If the system has a grid
      * @default true

package/lib/settingsObjects/deviceSettings/victronDeviceSettings.js

@@ -33,6 +33,11 @@ class VictronDeviceSettings extends deviceSettings_1.DeviceSettings {
          * The minimum battery level at which the system should be allowed to use AC
          */
         this.minimumDayTimeAcBatteryLevel = 60;
+        /**
+         * The minimum battery level at which the system should be allowed to use AC on expectetly hot/sunny days mornings
+         * @type {number}
+         */
+        this.minimumMorningSunnyDayAcBatteryLevel = 30;
         /**
          * If the system has a grid
          * @default true
@@ -68,21 +73,23 @@ class VictronDeviceSettings extends deviceSettings_1.DeviceSettings {
         this.excessEnergyTurnOffThreshold = 50;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         this.maxBatteryLoadWattage = (_a = data.maxBatteryLoadWattage) !== null && _a !== void 0 ? _a : this.maxBatteryLoadWattage;
         this.batteryReportingInterval = (_b = data.batteryReportingInterval) !== null && _b !== void 0 ? _b : this.batteryReportingInterval;
         this.hasBattery = (_c = data.hasBattery) !== null && _c !== void 0 ? _c : this.hasBattery;
         this.hasGrid = (_d = data.hasGrid) !== null && _d !== void 0 ? _d : this.hasGrid;
         this.hasSolar = (_e = data.hasSolar) !== null && _e !== void 0 ? _e : this.hasSolar;
         this.minimumNightTimeAcBatteryLevel = (_f = data.minimumNightTimeAcBatteryLevel) !== null && _f !== void 0 ? _f : this.minimumNightTimeAcBatteryLevel;
+        this.minimumMorningSunnyDayAcBatteryLevel =
+            (_g = data.minimumMorningSunnyDayAcBatteryLevel) !== null && _g !== void 0 ? _g : this.minimumMorningSunnyDayAcBatteryLevel;
         this.minimumTransientTimeAcBatteryLevel =
-            (_g = data.minimumTransientTimeAcBatteryLevel) !== null && _g !== void 0 ? _g : this.minimumTransientTimeAcBatteryLevel;
-        this.minimumDayTimeAcBatteryLevel = (_h = data.minimumDayTimeAcBatteryLevel) !== null && _h !== void 0 ? _h : this.minimumDayTimeAcBatteryLevel;
-        this.batteryCapacityWattage = (_j = data.batteryCapacityWattage) !== null && _j !== void 0 ? _j : this.batteryCapacityWattage;
-        this.normalBaseConsumptionWattage = (_k = data.normalBaseConsumptionWattage) !== null && _k !== void 0 ? _k : this.normalBaseConsumptionWattage;
-        this.maximumBatteryDischargeWattage = (_l = data.maximumBatteryDischargeWattage) !== null && _l !== void 0 ? _l : this.maximumBatteryDischargeWattage;
-        this.excessEnergyTurnOnThreshold = (_m = data.excessEnergyTurnOnThreshold) !== null && _m !== void 0 ? _m : this.excessEnergyTurnOnThreshold;
-        this.excessEnergyTurnOffThreshold = (_o = data.excessEnergyTurnOffThreshold) !== null && _o !== void 0 ? _o : this.excessEnergyTurnOffThreshold;
+            (_h = data.minimumTransientTimeAcBatteryLevel) !== null && _h !== void 0 ? _h : this.minimumTransientTimeAcBatteryLevel;
+        this.minimumDayTimeAcBatteryLevel = (_j = data.minimumDayTimeAcBatteryLevel) !== null && _j !== void 0 ? _j : this.minimumDayTimeAcBatteryLevel;
+        this.batteryCapacityWattage = (_k = data.batteryCapacityWattage) !== null && _k !== void 0 ? _k : this.batteryCapacityWattage;
+        this.normalBaseConsumptionWattage = (_l = data.normalBaseConsumptionWattage) !== null && _l !== void 0 ? _l : this.normalBaseConsumptionWattage;
+        this.maximumBatteryDischargeWattage = (_m = data.maximumBatteryDischargeWattage) !== null && _m !== void 0 ? _m : this.maximumBatteryDischargeWattage;
+        this.excessEnergyTurnOnThreshold = (_o = data.excessEnergyTurnOnThreshold) !== null && _o !== void 0 ? _o : this.excessEnergyTurnOnThreshold;
+        this.excessEnergyTurnOffThreshold = (_p = data.excessEnergyTurnOffThreshold) !== null && _p !== void 0 ? _p : this.excessEnergyTurnOffThreshold;
         super.fromPartialObject(data);
     }
     toJSON() {