hoffmation-base 3.0.0-alpha.93 → 3.0.0-alpha.95

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

@@ -84,4 +84,5 @@ export declare class Dachs implements iBaseDevice, iActuator {
     private onBatteryLevelChange;
     private onTempChange;
     private checkHeatingRod;
+    private shouldDachsBeStarted;
 }

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

@@ -158,6 +158,10 @@ class Dachs {
     /** @inheritDoc */
     setActuator(c) {
         devices_1.LampUtils.setActuator(this, c);
+        if (c.on && this.warmWaterPump && (this.queuedValue === true || this._dachsOn)) {
+            const startPumpCommand = new models_1.ActuatorSetStateCommand(c, true, 'Dachs is starting/on');
+            this.warmWaterPump.setActuator(startPumpCommand);
+        }
     }
     /** @inheritDoc */
     toggleActuator(c) {
@@ -198,35 +202,9 @@ class Dachs {
      * @param {BatteryLevelChangeAction} action - The action containing the new level
      */
     onBatteryLevelChange(action) {
+        const shouldDachsBeStarted = this.shouldDachsBeStarted(action);
         this.checkHeatingRod(action);
-        if (this.blockDachsStart !== undefined) {
-            if (action.newLevel > this.settings.batteryLevelPreventStartThreshold) {
-                const blockAction = new models_1.ActuatorSetStateCommand(action, true, `Battery reached ${action.newLevel}%, Dachs should not run any more`, null);
-                blockAction.overrideCommandSource = models_1.CommandSource.Force;
-                this.blockDachsStart.setActuator(blockAction);
-                return;
-            }
-            else if (action.newLevel < this.settings.batteryLevelAllowStartThreshold) {
-                const liftAction = new models_1.ActuatorSetStateCommand(action, false, `Battery reached ${action.newLevel}%, Dachs is now allowed to run if needed`, null);
-                this.blockDachsStart.setActuator(liftAction);
-            }
-            else if (this.blockDachsStart.actuatorOn) {
-                // We haven't reached the lower threshold yet --> nothing to do
-                return;
-            }
-        }
-        if (this._dachsOn) {
-            // We are already running
-            return;
-        }
-        const dayType = services_1.TimeCallbackService.dayType(new services_1.SunTimeOffsets());
-        if ((dayType === models_1.TimeOfDay.Daylight || dayType === models_1.TimeOfDay.BeforeSunrise) &&
-            action.newLevel > this.settings.batteryLevelTurnOnThreshold) {
-            // It is daytime (maybe solar power) and it is no critical battery level
-            return;
-        }
-        if (action.newLevel > this.settings.batteryLevelBeforeNightTurnOnThreshold) {
-            // It is not daylight but battery level is high enough
+        if (!shouldDachsBeStarted) {
             return;
         }
         const setStateCommand = new models_1.ActuatorSetStateCommand(action, true, 'Energy Level of battery dropped to critical level', null);
@@ -234,6 +212,7 @@ class Dachs {
         this.setActuator(setStateCommand);
     }
     onTempChange(action) {
+        var _a;
         if (this.warmWaterPump === undefined) {
             // We have no control over the warm water pump --> nothing to do
             return;
@@ -242,14 +221,22 @@ class Dachs {
         const heatStorageTemp = this._tempHeatStorage;
         let desiredState = false;
         let reason = '';
-        if (wwTemp > this.settings.warmWaterDesiredMinTemp + 3) {
-            desiredState = false;
-            reason = `Temperature of warm water pump ${wwTemp}°C is above desired minimum temperature ${this.settings.warmWaterDesiredMinTemp}°C`;
+        if (this._dachsOn) {
+            desiredState = true;
+            reason = 'Dachs is on anyways';
         }
         else if (wwTemp > heatStorageTemp) {
             desiredState = false;
             reason = `Temperature of warm water pump ${wwTemp}°C is higher than temperature of heat storage ${heatStorageTemp}°C`;
         }
+        else if (((_a = this.blockDachsStart) === null || _a === void 0 ? void 0 : _a.actuatorOn) === false) {
+            desiredState = true;
+            reason = 'Dachs is not blocked --> lowering storage temp might trigger it.';
+        }
+        else if (wwTemp > this.settings.warmWaterDesiredMinTemp + 3) {
+            desiredState = false;
+            reason = `Temperature of warm water pump ${wwTemp}°C is above desired minimum temperature ${this.settings.warmWaterDesiredMinTemp}°C`;
+        }
         else if (heatStorageTemp < this.settings.warmWaterDesiredMinTemp - 4) {
             desiredState = false;
             reason = `Temperature of heat storage ${heatStorageTemp}°C is too low to heat water.`;
@@ -280,5 +267,38 @@ class Dachs {
         const setAction = new models_1.ActuatorSetStateCommand(action, !shouldBeOff, `Battery reached ${action.newLevel}%, heating rod should be turned ${shouldBeOff ? 'off' : 'on'}`, null);
         this.heatingRod.setActuator(setAction);
     }
+    shouldDachsBeStarted(action) {
+        if (this.blockDachsStart !== undefined) {
+            if (action.newLevel > this.settings.batteryLevelPreventStartThreshold) {
+                const blockAction = new models_1.ActuatorSetStateCommand(action, true, `Battery reached ${action.newLevel}%, Dachs should not run any more`, null);
+                blockAction.overrideCommandSource = models_1.CommandSource.Force;
+                this.blockDachsStart.setActuator(blockAction);
+                return false;
+            }
+            else if (action.newLevel < this.settings.batteryLevelAllowStartThreshold) {
+                const liftAction = new models_1.ActuatorSetStateCommand(action, false, `Battery reached ${action.newLevel}%, Dachs is now allowed to run if needed`, null);
+                this.blockDachsStart.setActuator(liftAction);
+            }
+            else if (this.blockDachsStart.actuatorOn) {
+                // We haven't reached the lower threshold yet --> nothing to do
+                return false;
+            }
+        }
+        if (this._dachsOn) {
+            // We are already running
+            return false;
+        }
+        const dayType = services_1.TimeCallbackService.dayType(new services_1.SunTimeOffsets());
+        if ((dayType === models_1.TimeOfDay.Daylight || dayType === models_1.TimeOfDay.BeforeSunrise) &&
+            action.newLevel > this.settings.batteryLevelTurnOnThreshold) {
+            // It is daytime (maybe solar power) and it is no critical battery level
+            return false;
+        }
+        if (action.newLevel > this.settings.batteryLevelBeforeNightTurnOnThreshold) {
+            // It is not daylight but battery level is high enough
+            return false;
+        }
+        return true;
+    }
 }
 exports.Dachs = Dachs;

package/lib/server/devices/sharedFunctions/handleSensor.js

@@ -64,7 +64,7 @@ class HandleSensor {
             if (heatgroup !== undefined) {
                 const desiredTemp = heatgroup.desiredTemp;
                 const currentTemp = heatgroup.temperature;
-                const outSideTemp = services_1.WeatherService.getCurrentTemp();
+                const outSideTemp = services_1.WeatherService.currentTemp;
                 // Check if any of these values are unavailable
                 if (desiredTemp > -99 && currentTemp > -99 && outSideTemp > -99) {
                     const wouldHelp = (desiredTemp < currentTemp && outSideTemp < currentTemp) ||

package/lib/server/services/weather/weather-service.d.ts

@@ -15,7 +15,7 @@ export declare class WeatherService {
     /**
      * The last weather response
      */
-    static lastResponse: WeatherResponse;
+    static lastResponse: WeatherResponse | undefined;
     /**
      * The sun horizontal degree (0 is North)
      */
@@ -31,8 +31,9 @@ export declare class WeatherService {
     static update(): void;
     static stopInterval(): void;
     static playWeatherInfo(speaker: iSpeaker, volume?: number, short?: boolean, retries?: number): void;
-    static processHourlyWeather(): void;
-    static getCurrentTemp(): number;
+    static processHourlyWeather(response: WeatherResponse): void;
+    static get currentHumidity(): number;
+    static get currentTemp(): number;
     static willOutsideBeWarmer(referenceTemperature: number, logger: (level: LogLevel, message: string, debugType?: LogDebugType) => void): boolean;
     static weatherRolloPosition(normalPos: number, desiredTemperatur: number, currentTemperatur: number, logger: (level: LogLevel, message: string, debugType?: LogDebugType) => void, shutterSettings: ShutterSettings): number;
     static getCurrentCloudiness(): number;

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

@@ -105,7 +105,8 @@ class WeatherService {
             speaker.speakOnDevice('Für heute liegt keine Unwetterwarnungen vor', volume, false);
         }
     }
-    static processHourlyWeather() {
+    static processHourlyWeather(response) {
+        this.lastResponse = response;
         log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, `Es sind gerade ${this.lastResponse.current.temp} Grad (gefühlt ${this.lastResponse.current.feels_like}).`);
         if (this.lastResponse.alerts !== undefined && this.lastResponse.alerts.length > 0) {
             const message = ['Es gibt folgende Wetterwarnungen:'];
@@ -115,13 +116,21 @@ class WeatherService {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, message.join('\n'));
         }
     }
-    static getCurrentTemp() {
-        const wData = WeatherService.lastResponse;
-        if (wData === undefined || wData.current === undefined) {
+    static get currentHumidity() {
+        var _a;
+        if (((_a = WeatherService.lastResponse) === null || _a === void 0 ? void 0 : _a.current) === undefined) {
+            log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'WeatherService.currentHumidity: There is no data yet');
+            return -1;
+        }
+        return WeatherService.lastResponse.current.humidity;
+    }
+    static get currentTemp() {
+        var _a;
+        if (((_a = WeatherService.lastResponse) === null || _a === void 0 ? void 0 : _a.current) === undefined) {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Info, 'WeatherService.isOutsideWarmer(): There are no data yet');
             return -99;
         }
-        return wData.current.temp;
+        return WeatherService.lastResponse.current.temp;
     }
     static willOutsideBeWarmer(referenceTemperature, logger) {
         const wData = WeatherService.lastResponse;
@@ -171,7 +180,8 @@ class WeatherService {
         return wData.current.clouds;
     }
     static getRainNextMinutes() {
-        const minutes = WeatherService.lastResponse.minutely;
+        var _a;
+        const minutes = (_a = WeatherService.lastResponse) === null || _a === void 0 ? void 0 : _a.minutely;
         let minutesUsed = 0;
         let precipitation = 0;
         if (minutes !== undefined) {
@@ -186,8 +196,9 @@ class WeatherService {
         return { minutes: minutesUsed, precipitation: precipitation };
     }
     static getActiveAlerts() {
+        var _a;
         const result = [];
-        if (WeatherService.lastResponse.alerts === undefined || WeatherService.lastResponse.alerts.length === 0) {
+        if (((_a = WeatherService.lastResponse) === null || _a === void 0 ? void 0 : _a.alerts) === undefined || WeatherService.lastResponse.alerts.length === 0) {
             return result;
         }
         const now = new Date().getTime();
@@ -212,8 +223,8 @@ class WeatherService {
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.Debug, 'WeatherAPi Response erhalten');
             log_service_1.ServerLogService.writeLog(models_1.LogLevel.DeepTrace, `WeatherAPi Response: ${response}`);
             utils_1.Utils.guardedFunction(() => {
-                WeatherService.lastResponse = JSON.parse(response);
-                WeatherService.processHourlyWeather();
+                const responseObj = JSON.parse(response);
+                WeatherService.processHourlyWeather(responseObj);
                 for (const dataUpdateCbsKey in this._dataUpdateCbs) {
                     this._dataUpdateCbs[dataUpdateCbsKey]();
                 }