hoffmation-base 3.3.2 → 3.3.8

package/lib/devices/groups/windowGroup.js

@@ -165,10 +165,8 @@ class WindowGroup extends base_group_1.BaseGroup {
         if (this.sunsetShutterCallback && room.settings.rolloOffset) {
             this.sunsetShutterCallback.minuteOffset = room.settings.rolloOffset.sunset;
             this.sunsetShutterCallback.sunTimeOffset = room.settings.rolloOffset;
-            if (room.settings.sonnenUntergangRolloAdditionalOffsetPerCloudiness > 0) {
-                this.sunsetShutterCallback.cloudOffset =
-                    services_1.WeatherService.getCurrentCloudiness() * room.settings.sonnenUntergangRolloAdditionalOffsetPerCloudiness;
-            }
+            this.sunsetShutterCallback.cloudOffset =
+                services_1.WeatherService.getCurrentCloudiness() * room.settings.sonnenUntergangRolloAdditionalOffsetPerCloudiness;
             this.sunsetShutterCallback.recalcNextToDo(new Date());
         }
         if (this.sunsetShutterCallback === undefined) {

package/lib/devices/zigbee/BaseDevices/zigbeeMotionSensor.d.ts

@@ -16,7 +16,7 @@ export declare class ZigbeeMotionSensor extends ZigbeeDevice implements iMotionS
     protected _movementDetectedCallback: Array<(action: MotionSensorAction) => void>;
     protected _needsMovementResetFallback: boolean;
     protected _fallBackTimeout: NodeJS.Timeout | undefined;
-    protected _timeSinceLastMotion: number;
+    protected _motionDetectedTimestamp: number;
     protected readonly _occupancyStateId: string;
     private _movementDetected;
     constructor(pInfo: IoBrokerDeviceInfo, type: DeviceType);

package/lib/devices/zigbee/BaseDevices/zigbeeMotionSensor.js

@@ -20,7 +20,7 @@ class ZigbeeMotionSensor extends zigbeeDevice_1.ZigbeeDevice {
         this._initialized = false;
         this._movementDetectedCallback = [];
         this._needsMovementResetFallback = true;
-        this._timeSinceLastMotion = 0;
+        this._motionDetectedTimestamp = 0;
         this._occupancyStateId = 'occupancy';
         this._movementDetected = false;
         this.deviceCapabilities.push(enums_1.DeviceCapability.motionSensor);
@@ -60,7 +60,10 @@ class ZigbeeMotionSensor extends zigbeeDevice_1.ZigbeeDevice {
     // Time since last motion in seconds
     /** @inheritDoc */
     get timeSinceLastMotion() {
-        return this._timeSinceLastMotion;
+        if (this._motionDetectedTimestamp === 0) {
+            return 0;
+        }
+        return (utils_1.Utils.nowMS() - this._motionDetectedTimestamp) / 1000;
     }
     /**
      * Adds a callback for when a motion state has changed.
@@ -83,6 +86,9 @@ class ZigbeeMotionSensor extends zigbeeDevice_1.ZigbeeDevice {
             }, 1000, this);
             return;
         }
+        else if (newState) {
+            this._motionDetectedTimestamp = utils_1.Utils.nowMS();
+        }
         if (newState === this._movementDetected) {
             this.log(enums_1.LogLevel.Debug, `Skip movement because state is already ${newState}`, enums_1.LogDebugType.SkipUnchangedMovementState);
             if (newState) {
@@ -120,10 +126,6 @@ class ZigbeeMotionSensor extends zigbeeDevice_1.ZigbeeDevice {
                 this.log(enums_1.LogLevel.Trace, `Motion sensor: Update for motion state of ${this.info.customName}: ${state.val}`);
                 this.updateMovement(state.val);
                 break;
-            case 'no_motion':
-                this.log(state.val < 100 ? enums_1.LogLevel.Trace : enums_1.LogLevel.DeepTrace, `Motion sensor: Update for time since last motion of ${this.info.customName}: ${state.val}`);
-                this._timeSinceLastMotion = state.val;
-                break;
         }
     }
     resetFallbackTimeout() {

package/lib/models/timeCallback.js

@@ -35,7 +35,7 @@ class TimeCallback {
         this.lastDone = new Date(0);
     }
     recalcNextToDo(now) {
-        var _a;
+        var _a, _b;
         const today = new Date(now.getTime());
         today.setHours(0, 0, 0, 0);
         let nextCalculatedTime;
@@ -71,16 +71,13 @@ class TimeCallback {
                 }
                 break;
             case enums_1.TimeCallbackType.SunSet:
-                if (this.nextToDo === undefined || this.lastDone.getDate() === this.calculationSunset.getDate()) {
+                if (this._calculationSunset === undefined ||
+                    this.nextToDo === undefined ||
+                    this.lastDone.getDate() === this.calculationSunset.getDate()) {
                     this._calculationSunset = new Date(services_1.TimeCallbackService.nextSunSet.getTime());
                 }
-                if (this.cloudOffset === undefined) {
-                    this.cloudOffset = 0;
-                }
-                else {
-                    this.cloudOffset = this.cloudOffset * -1;
-                }
-                nextCalculatedTime = new Date(this.calculationSunset.getTime() + (this.minuteOffset + this.cloudOffset) * 60 * 1000);
+                (_a = this.cloudOffset) !== null && _a !== void 0 ? _a : (this.cloudOffset = 0);
+                nextCalculatedTime = new Date(this.calculationSunset.getTime() + (this.minuteOffset - this.cloudOffset) * 60 * 1000);
                 if (this.sunTimeOffset) {
                     const nextMaxSS = this.sunTimeOffset.getNextMaximumSunset(now);
                     if (nextMaxSS < nextCalculatedTime && nextCalculatedTime.getDate() === nextMaxSS.getDate()) {
@@ -89,7 +86,7 @@ class TimeCallback {
                 }
                 break;
         }
-        if (((_a = this.nextToDo) === null || _a === void 0 ? void 0 : _a.getTime()) == nextCalculatedTime.getTime()) {
+        if (((_b = this.nextToDo) === null || _b === void 0 ? void 0 : _b.getTime()) == nextCalculatedTime.getTime()) {
             // No change
             return;
         }