hoffmation-base 2.9.11 → 2.9.13

package/lib/models/deviceSettings/index.d.ts

@@ -11,5 +11,4 @@ export * from './shutterSettings';
 export * from './sonosDeviceSettings';
 export * from './tvSettings';
 export * from './victronDeviceSettings';
-export * from './windowSettings';
 export * from './wledSettings';

package/lib/models/deviceSettings/index.js

@@ -27,5 +27,4 @@ __exportStar(require("./shutterSettings"), exports);
 __exportStar(require("./sonosDeviceSettings"), exports);
 __exportStar(require("./tvSettings"), exports);
 __exportStar(require("./victronDeviceSettings"), exports);
-__exportStar(require("./windowSettings"), exports);
 __exportStar(require("./wledSettings"), exports);

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

@@ -2,6 +2,16 @@ import { DeviceSettings } from './deviceSettings';
 export declare class ShutterSettings extends DeviceSettings {
     msTilTop: number;
     msTilBot: number;
+    /**
+     * The direction this shutter is facing (0 = North, 180 = South)
+     * @type {number}
+     */
+    direction: number;
+    /**
+     * The desired position, when the shutter should perform a heat reduction.
+     * @type {number}
+     */
+    heatReductionPosition: 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/models/deviceSettings/shutterSettings.js

@@ -8,6 +8,16 @@ class ShutterSettings extends deviceSettings_1.DeviceSettings {
         super(...arguments);
         this.msTilTop = -1;
         this.msTilBot = -1;
+        /**
+         * The direction this shutter is facing (0 = North, 180 = South)
+         * @type {number}
+         */
+        this.direction = 180;
+        /**
+         * The desired position, when the shutter should perform a heat reduction.
+         * @type {number}
+         */
+        this.heatReductionPosition = 40;
         /**
          * Some shutter give no position feedback on their own, so by knowing the durations in either direction,
          * we can programmatically trigger the callbacks.
@@ -16,10 +26,11 @@ class ShutterSettings extends deviceSettings_1.DeviceSettings {
         this.triggerPositionUpdateByTime = false;
     }
     fromPartialObject(data) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         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.triggerPositionUpdateByTime = (_c = data.triggerPositionUpdateByTime) !== null && _c !== void 0 ? _c : this.triggerPositionUpdateByTime;
+        this.direction = (_c = data.direction) !== null && _c !== void 0 ? _c : this.direction;
+        this.triggerPositionUpdateByTime = (_d = data.triggerPositionUpdateByTime) !== null && _d !== void 0 ? _d : this.triggerPositionUpdateByTime;
         super.fromPartialObject(data);
     }
     toJSON() {

package/lib/server/devices/baseDeviceInterfaces/iShutter.d.ts

@@ -1,6 +1,8 @@
 import { Window } from '../groups';
 import { iRoomDevice } from './iRoomDevice';
+import { ShutterSettings } from '../../../models';
 export interface iShutter extends iRoomDevice {
+    settings: ShutterSettings;
     currentLevel: number;
     desiredWindowShutterLevel: number;
     window: Window | undefined;

package/lib/server/devices/groups/Window.d.ts

@@ -1,6 +1,5 @@
 import { HmIpGriff } from '../hmIPDevices';
 import { WindowPosition } from '../models';
-import { WindowSettings } from '../../../models';
 import { iShutter, iVibrationSensor } from '../baseDeviceInterfaces';
 import { BaseGroup } from './base-group';
 import { ZigbeeMagnetContact } from '../zigbee';
@@ -10,7 +9,6 @@ export declare class Window extends BaseGroup {
     readonly shutterIds: string[];
     readonly magnetIds: string[];
     desiredPosition: number;
-    settings: WindowSettings;
     constructor(roomName: string, handleIds?: string[], vibrationIds?: string[], shutterIds?: string[], magnetIds?: string[]);
     /**
      * sets the desired Pos and moves rollo to this level

package/lib/server/devices/groups/Window.js

@@ -16,7 +16,6 @@ class Window extends base_group_1.BaseGroup {
         this.shutterIds = shutterIds;
         this.magnetIds = magnetIds;
         this.desiredPosition = 0;
-        this.settings = new models_2.WindowSettings();
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Handle, new device_list_1.DeviceList(handleIds));
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Vibration, new device_list_1.DeviceList(vibrationIds));
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.Shutter, new device_list_1.DeviceList(shutterIds));

package/lib/server/devices/groups/windowGroup.js

@@ -70,8 +70,9 @@ class WindowGroup extends base_group_1.BaseGroup {
         const timeOfDay = services_1.TimeCallbackService.dayType(room.settings.rolloOffset);
         const darkOutside = services_1.TimeCallbackService.darkOutsideOrNight(timeOfDay);
         this.windows.forEach((f) => {
-            var _a, _b, _c, _d;
-            if (f.getShutter().length === 0) {
+            var _a, _b, _c, _d, _e, _f;
+            const shutterSettings = (_b = (_a = f.getShutter()) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.settings;
+            if (!shutterSettings) {
                 return;
             }
             if (darkOutside) {
@@ -80,7 +81,7 @@ class WindowGroup extends base_group_1.BaseGroup {
             }
             let desiredPos = f.desiredPosition;
             if (desiredPos > 0) {
-                desiredPos = services_1.WeatherService.weatherRolloPosition(desiredPos, (_b = (_a = room.HeatGroup) === null || _a === void 0 ? void 0 : _a.desiredTemp) !== null && _b !== void 0 ? _b : -99, (_d = (_c = room.HeatGroup) === null || _c === void 0 ? void 0 : _c.temperature) !== null && _d !== void 0 ? _d : -99, this.log.bind(this), f.settings.direction);
+                desiredPos = services_1.WeatherService.weatherRolloPosition(desiredPos, (_d = (_c = room.HeatGroup) === null || _c === void 0 ? void 0 : _c.desiredTemp) !== null && _d !== void 0 ? _d : -99, (_f = (_e = room.HeatGroup) === null || _e === void 0 ? void 0 : _e.temperature) !== null && _f !== void 0 ? _f : -99, this.log.bind(this), shutterSettings);
             }
             if (f.griffeInPosition(models_2.WindowPosition.offen) > 0 && desiredPos < 100) {
                 return;

package/lib/server/devices/hmIPDevices/hmIpRoll.d.ts

@@ -1,10 +1,12 @@
 /// <reference types="iobroker" />
 import { HmIPDevice } from './hmIpDevice';
 import { Window } from '../groups';
+import { ShutterSettings } from '../../../models';
 import { iShutter } from '../baseDeviceInterfaces';
 import { IoBrokerBaseDevice } from '../IoBrokerBaseDevice';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class HmIpRoll extends HmIPDevice implements iShutter {
+    settings: ShutterSettings;
     private _setLevelSwitchID;
     private _firstCommandRecieved;
     private _setLevel;

package/lib/server/devices/hmIPDevices/hmIpRoll.js

@@ -15,6 +15,7 @@ class HmIpRoll extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         var _a;
         super(pInfo, deviceType_1.DeviceType.HmIpRoll);
+        this.settings = new models_2.ShutterSettings();
         this._firstCommandRecieved = false;
         this._setLevel = -1;
         this._setLevelTime = -1;

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

@@ -3,7 +3,7 @@ import { WeatherCurrent } from './weather-current';
 import { WeatherMinutes } from './weather-minutes';
 import { WeatherAlert } from './weather-alert';
 import { iWeatherSettings } from '../../config';
-import { LogLevel } from '../../../models';
+import { LogLevel, ShutterSettings } from '../../../models';
 import { LogDebugType } from '../log-service';
 import { WeatherDaily } from './weather-daily';
 import { iSpeaker } from '../../devices';
@@ -40,7 +40,7 @@ export declare class WeatherService {
     static processHourlyWeather(): void;
     static getCurrentTemp(): 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, windowDirection?: number): number;
+    static weatherRolloPosition(normalPos: number, desiredTemperatur: number, currentTemperatur: number, logger: (level: LogLevel, message: string, debugType?: LogDebugType) => void, shutterSettings: ShutterSettings): number;
     static getCurrentCloudiness(): number;
     private static getRainNextMinutes;
     private static getActiveAlerts;

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

@@ -127,7 +127,7 @@ class WeatherService {
         logger(models_1.LogLevel.Info, `willOutsideBeWarmer(${referenceTemperature}) --> Today Max Temperature: ${wData.daily[0].temp.max}`);
         return referenceTemperature < wData.daily[0].temp.max;
     }
-    static weatherRolloPosition(normalPos, desiredTemperatur, currentTemperatur, logger, windowDirection) {
+    static weatherRolloPosition(normalPos, desiredTemperatur, currentTemperatur, logger, shutterSettings) {
         let result = normalPos;
         if (currentTemperatur < desiredTemperatur) {
             logger(models_1.LogLevel.Trace, `RolloWeatherPosition: Room needs to heat up anyways.`);
@@ -141,8 +141,8 @@ class WeatherService {
             logger(models_1.LogLevel.Trace, `RolloWeatherPosition: It's close to or after todays sunset`);
             return result;
         }
-        else if (windowDirection !== undefined &&
-            !utils_1.Utils.degreeInBetween(windowDirection - 50, windowDirection + 50, this.sunDirection)) {
+        else if (shutterSettings.direction !== undefined &&
+            !utils_1.Utils.degreeInBetween(shutterSettings.direction - 50, shutterSettings.direction + 50, this.sunDirection)) {
             logger(models_1.LogLevel.Trace, `RolloWeatherPosition: Sun is facing a different direction`);
             return result;
         }
@@ -150,7 +150,7 @@ class WeatherService {
             logger(models_1.LogLevel.Trace, `RolloWeatherPosition: It´s cloudy now.`);
         }
         else if (this.willOutsideBeWarmer(26, logger)) {
-            result = 30;
+            result = shutterSettings.heatReductionPosition;
         }
         if (result !== normalPos) {
             logger(models_1.LogLevel.Info, `weatherRolloPosition(${normalPos}, ${desiredTemperatur}, ${currentTemperatur}) --> Target: ${result}`);