hoffmation-base 3.0.0-alpha.65 → 3.0.0-alpha.67

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/windowGroup.js

@@ -181,9 +181,14 @@ 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.anyShutterDown) {
-                this.sunriseUp(new models_1.ShutterSunriseUpCommand(models_1.CommandSource.Initial, 'Initial sunrise up as it is day and at least 1 shutter is down.'));
+            if (!services_1.TimeCallbackService.darkOutsideOrNight(services_1.TimeCallbackService.dayType(room.settings.rolloOffset))) {
+                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

@@ -19,7 +19,7 @@ class SmartGardenMower extends smartGardenDevice_1.SmartGardenDevice {
         this.queuedValue = null;
         this._lastPersist = 0;
         this._actuatorOn = false;
-        this._activityControlStateId = `${pInfo.fullID}.SERVICE_MOWER_${this._deviceSerial}/activity_control_i`;
+        this._activityControlStateId = `${pInfo.fullID}.SERVICE_MOWER_${this._deviceSerial}.activity_control_i`;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.actuator);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.blockAutomatic);
         this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));
@@ -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;

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

@@ -20,8 +20,8 @@ class SmartGardenValve extends smartGardenDevice_1.SmartGardenDevice {
         this.queuedValue = null;
         this._lastPersist = 0;
         this._actuatorOn = false;
-        this._durationValueStateId = `${pInfo.fullID}.SERVICE_VALVE_${this._deviceSerial}/duration_value`;
-        this._stopAllValvesStateId = `${pInfo.fullID}.SERVICE_VALVE_SET_${this._deviceSerial}/stop_all_valves_i`;
+        this._durationValueStateId = `${pInfo.fullID}.SERVICE_VALVE_${this._deviceSerial}.duration_value`;
+        this._stopAllValvesStateId = `${pInfo.fullID}.SERVICE_VALVE_SET_${this._deviceSerial}.stop_all_valves_i`;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.actuator);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.blockAutomatic);
         this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this), this.log.bind(this));