hoffmation-base 3.2.11 → 3.2.15

package/lib/devices/dachs/dachs.js

@@ -225,7 +225,11 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
         const heatStorageTemp = this._tempHeatStorage;
         let desiredWwPumpState = false;
         let reason = '';
-        if (((_a = this.warmWaterDachsAlternativeActuator) === null || _a === void 0 ? void 0 : _a.actuatorOn) === true) {
+        if (this.settings.disableDachsOwnWW) {
+            desiredWwPumpState = false;
+            reason = 'Dachs own WW is disabled';
+        }
+        else if (((_a = this.warmWaterDachsAlternativeActuator) === null || _a === void 0 ? void 0 : _a.actuatorOn) === true) {
             desiredWwPumpState = false;
             reason = 'Alternative heating source is on';
         }
@@ -346,7 +350,11 @@ class Dachs extends RoomBaseDevice_1.RoomBaseDevice {
         }
         let desiredState = false;
         let reason = 'Dachs is allowed to run --> Block alternative heating source';
-        if (shouldDachsBeStarted || this._dachsOn) {
+        if (this.settings.disableDachsOwnWW) {
+            reason = 'Dachs own WW is disabled';
+            desiredState = true;
+        }
+        else if (shouldDachsBeStarted || this._dachsOn) {
             reason = 'Dachs is running or should be started';
             desiredState = false;
         }

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

@@ -11,6 +11,10 @@ export interface iDachsDeviceSettings extends iActuatorSettings {
      * Whether the secondary water heating source should be disabled regardless of battery level.
      */
     disableHeatingRod: boolean;
+    /**
+     * Option to disable Warm-Water production from dachs completely.
+     */
+    disableDachsOwnWW: 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/services/Sonos/sonos-service.js

@@ -86,9 +86,13 @@ class SonosService {
             logging_1.ServerLogService.writeLog(enums_1.LogLevel.Alert, 'SonosService noch nicht initialisiert.');
         }
         polly_service_1.PollyService.tts(pMessage, (networkPath, duration) => {
-            const hours = new Date().getHours();
-            const volume = hours < 10 || hours > 22 ? 40 : 80;
             for (const deviceName in this.ownDevices) {
+                const snDevice = this.ownDevices[deviceName];
+                const room = snDevice.room;
+                const timeOfDay = time_callback_service_1.TimeCallbackService.dayType(room.settings.rolloOffset);
+                const volume = timeOfDay == enums_1.TimeOfDay.Night
+                    ? snDevice.settings.defaultNightAnounceVolume
+                    : snDevice.settings.defaultDayAnounceVolume;
                 this.ownDevices[deviceName].playOnDevice(networkPath, duration, volumeOverride > -1
                     ? volumeOverride
                     : Math.min(volume, this.ownDevices[deviceName].settings.maxPlayOnAllVolume));

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

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

package/lib/settingsObjects/deviceSettings/dachsSettings.js

@@ -11,6 +11,8 @@ class DachsDeviceSettings extends actuatorSettings_1.ActuatorSettings {
         /** @inheritDoc */
         this.disableHeatingRod = false;
         /** @inheritDoc */
+        this.disableDachsOwnWW = false;
+        /** @inheritDoc */
         this.batteryLevelTurnOnThreshold = -1;
         /** @inheritDoc */
         this.batteryLevelBeforeNightTurnOnThreshold = -1;
@@ -30,22 +32,23 @@ class DachsDeviceSettings extends actuatorSettings_1.ActuatorSettings {
         this.winterMinimumPreNightHeatStorageTemp = 65;
     }
     fromPartialObject(data) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         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.disableDachsOwnWW = (_b = data.disableDachsOwnWW) !== null && _b !== void 0 ? _b : this.disableDachsOwnWW;
+        this.refreshIntervalTime = (_c = data.refreshIntervalTime) !== null && _c !== void 0 ? _c : this.refreshIntervalTime;
         this.batteryLevelBeforeNightTurnOnThreshold =
-            (_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;
+            (_d = data.batteryLevelBeforeNightTurnOnThreshold) !== null && _d !== void 0 ? _d : this.batteryLevelBeforeNightTurnOnThreshold;
+        this.batteryLevelTurnOnThreshold = (_e = data.batteryLevelTurnOnThreshold) !== null && _e !== void 0 ? _e : this.batteryLevelTurnOnThreshold;
+        this.batteryLevelHeatingRodThreshold = (_f = data.batteryLevelHeatingRodThreshold) !== null && _f !== void 0 ? _f : this.batteryLevelHeatingRodThreshold;
         this.batteryLevelPreventStartThreshold =
-            (_f = data.batteryLevelPreventStartThreshold) !== null && _f !== void 0 ? _f : this.batteryLevelPreventStartThreshold;
+            (_g = data.batteryLevelPreventStartThreshold) !== null && _g !== void 0 ? _g : this.batteryLevelPreventStartThreshold;
         this.batteryLevelPreventStartAtNightThreshold =
-            (_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;
+            (_h = data.batteryLevelPreventStartAtNightThreshold) !== null && _h !== void 0 ? _h : this.batteryLevelPreventStartAtNightThreshold;
+        this.batteryLevelAllowStartThreshold = (_j = data.batteryLevelAllowStartThreshold) !== null && _j !== void 0 ? _j : this.batteryLevelAllowStartThreshold;
+        this.warmWaterDesiredMinTemp = (_k = data.warmWaterDesiredMinTemp) !== null && _k !== void 0 ? _k : this.warmWaterDesiredMinTemp;
+        this.winterMinimumHeatStorageTemp = (_l = data.winterMinimumHeatStorageTemp) !== null && _l !== void 0 ? _l : this.winterMinimumHeatStorageTemp;
         this.winterMinimumPreNightHeatStorageTemp =
-            (_l = data.winterMinimumPreNightHeatStorageTemp) !== null && _l !== void 0 ? _l : this.winterMinimumPreNightHeatStorageTemp;
+            (_m = data.winterMinimumPreNightHeatStorageTemp) !== null && _m !== void 0 ? _m : this.winterMinimumPreNightHeatStorageTemp;
         super.fromPartialObject(data);
     }
     toJSON() {

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

@@ -5,6 +5,18 @@ export declare class SonosDeviceSettings extends DeviceSettings {
      * @default 80
      */
     maxPlayOnAllVolume: number;
+    /**
+     * The default volume to inform of non critical stuff during daytime
+     * @type {number}
+     * @default 80
+     */
+    defaultDayAnounceVolume: number;
+    /**
+     * The default volume to inform of non critical stuff during nighttime
+     * @type {number}
+     * @default 80
+     */
+    defaultNightAnounceVolume: number;
     fromPartialObject(data: Partial<SonosDeviceSettings>): void;
     toJSON(): Partial<SonosDeviceSettings>;
 }

package/lib/settingsObjects/deviceSettings/sonosDeviceSettings.js

@@ -11,10 +11,24 @@ class SonosDeviceSettings extends deviceSettings_1.DeviceSettings {
          * @default 80
          */
         this.maxPlayOnAllVolume = 80;
+        /**
+         * The default volume to inform of non critical stuff during daytime
+         * @type {number}
+         * @default 80
+         */
+        this.defaultDayAnounceVolume = 80;
+        /**
+         * The default volume to inform of non critical stuff during nighttime
+         * @type {number}
+         * @default 80
+         */
+        this.defaultNightAnounceVolume = 40;
     }
     fromPartialObject(data) {
-        var _a;
+        var _a, _b, _c;
         this.maxPlayOnAllVolume = (_a = data.maxPlayOnAllVolume) !== null && _a !== void 0 ? _a : this.maxPlayOnAllVolume;
+        this.defaultDayAnounceVolume = (_b = data.defaultDayAnounceVolume) !== null && _b !== void 0 ? _b : this.defaultDayAnounceVolume;
+        this.defaultNightAnounceVolume = (_c = data.defaultNightAnounceVolume) !== null && _c !== void 0 ? _c : this.defaultNightAnounceVolume;
         super.fromPartialObject(data);
     }
     toJSON() {