hoffmation-base 3.0.0-alpha.64 → 3.0.0-alpha.66

package/lib/models/command/WindowSetDesiredPositionCommand.d.ts

@@ -3,6 +3,7 @@ import { CommandSource } from './commandSource';
 import { CommandType } from './commandType';
 export declare class WindowSetDesiredPositionCommand extends BaseCommand {
     readonly position: number;
+    readonly applyNewPosition: boolean;
     /** @inheritDoc */
     type: CommandType;
     /**
@@ -10,6 +11,7 @@ export declare class WindowSetDesiredPositionCommand extends BaseCommand {
      * @param source - The source of the command
      * @param position - The desired position of the shutter (0 closed, 100 open)
      * @param reason - You can provide a reason for clarification
+     * @param applyNewPosition - Whether this new position should be applied immediately
      */
-    constructor(source: CommandSource | BaseCommand, position: number, reason?: string);
+    constructor(source: CommandSource | BaseCommand, position: number, reason?: string, applyNewPosition?: boolean);
 }

package/lib/models/command/WindowSetDesiredPositionCommand.js

@@ -9,10 +9,12 @@ class WindowSetDesiredPositionCommand extends baseCommand_1.BaseCommand {
      * @param source - The source of the command
      * @param position - The desired position of the shutter (0 closed, 100 open)
      * @param reason - You can provide a reason for clarification
+     * @param applyNewPosition - Whether this new position should be applied immediately
      */
-    constructor(source, position, reason = '') {
+    constructor(source, position, reason = '', applyNewPosition = true) {
         super(source, reason);
         this.position = position;
+        this.applyNewPosition = applyNewPosition;
         /** @inheritDoc */
         this.type = commandType_1.CommandType.WindowSetDesiredPositionCommand;
     }

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

@@ -15,6 +15,11 @@ export declare class Window extends BaseGroup {
      * @returns {number} The level (0 closed, 100 open)
      */
     get desiredPosition(): number;
+    /**
+     * Checks if any shutter is down (0%)
+     * @returns {boolean} true if any shutter is down
+     */
+    get anyShutterDown(): boolean;
     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,6 +16,15 @@ class Window extends base_group_1.BaseGroup {
     get desiredPosition() {
         return this._desiredPosition;
     }
+    /**
+     * Checks if any shutter is down (0%)
+     * @returns {boolean} true if any shutter is down
+     */
+    get anyShutterDown() {
+        return this.getShutter().some((s) => {
+            return s.currentLevel === 0;
+        });
+    }
     constructor(roomName, handleIds = [], vibrationIds = [], shutterIds = [], magnetIds = []) {
         super(roomName, group_type_1.GroupType.Window);
         this.handleIds = handleIds;

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

@@ -15,6 +15,11 @@ export declare class WindowGroup extends BaseGroup {
      * @warning Manual setting of this callback is not recommended. Prefer {@link recalcTimeCallbacks} after changing settings.
      */
     sunsetShutterCallback: TimeCallback | undefined;
+    /**
+     * Checks if any Shutter of any window is down
+     * @returns {boolean} True if there is atleast one shutte with level of 0%.
+     */
+    get anyShutterDown(): boolean;
     constructor(roomName: string, windows: Window[]);
     setDesiredPosition(c: WindowSetDesiredPositionCommand): void;
     initialize(): void;

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

@@ -9,6 +9,15 @@ const group_type_1 = require("./group-type");
 const device_list_1 = require("../device-list");
 const device_cluster_type_1 = require("../device-cluster-type");
 class WindowGroup extends base_group_1.BaseGroup {
+    /**
+     * Checks if any Shutter of any window is down
+     * @returns {boolean} True if there is atleast one shutte with level of 0%.
+     */
+    get anyShutterDown() {
+        return this.windows.some((w) => {
+            w.anyShutterDown;
+        });
+    }
     constructor(roomName, windows) {
         super(roomName, group_type_1.GroupType.WindowGroup);
         this.windows = windows;
@@ -173,7 +182,13 @@ class WindowGroup extends base_group_1.BaseGroup {
                 this.sunriseUp(new models_1.ShutterSunriseUpCommand(models_1.CommandSource.Automatic, 'Time-Callback fired'));
             }, room.settings.rolloOffset.sunrise, undefined, undefined, room.settings.rolloOffset);
             if (!services_1.TimeCallbackService.darkOutsideOrNight(services_1.TimeCallbackService.dayType(room.settings.rolloOffset))) {
-                this.sunriseUp(new models_1.ShutterSunriseUpCommand(models_1.CommandSource.Initial, 'Initial sunrise up as it is day'));
+                if (!this.anyShutterDown) {
+                    // Only set new desired position without applying it.
+                    this.setDesiredPosition(new models_1.WindowSetDesiredPositionCommand(models_1.CommandSource.Initial, 100, 'It is daytime during restart.', false));
+                }
+                else {
+                    this.sunriseUp(new models_1.ShutterSunriseUpCommand(models_1.CommandSource.Initial, 'Initial sunrise up as it is day and at least 1 shutter is down.'));
+                }
             }
             services_1.TimeCallbackService.addCallback(this.sunriseShutterCallback);
         }

package/lib/server/devices/smartGarden/smartGardenMower.js

@@ -43,7 +43,7 @@ class SmartGardenMower extends smartGardenDevice_1.SmartGardenDevice {
         const stateName = idSplit[5];
         if (folder.indexOf('SERVICE_MOWER') === 0) {
             switch (stateName) {
-                case 'activity_value':
+                case 'activity_moving_i':
                     this._actuatorOn = state.val;
                     this.persist();
                     break;