@uncaught/gpio-shutter-bridge 1.2.0 → 1.2.1

package/dist/Shutter/VeluxShutter.d.ts

@@ -34,7 +34,7 @@ export declare class VeluxShutter implements ShutterInterfaceWithState, ShutterI
     private notifyPositionChange;
     private storeDuration;
     private getAverageDuration;
-    private getAverageActionDuration;
+    private getEstimatedActionDuration;
     private getPositionDelta;
     private setState;
     private clearPositioningTimeout;

package/dist/Shutter/VeluxShutter.js

@@ -88,18 +88,20 @@ export class VeluxShutter {
         }
         return 0;
     }
-    getAverageActionDuration(action) {
+    getEstimatedActionDuration(action) {
+        const signalDuration = this.getAverageDuration('topSignalDurations');
+        let avg = 0;
         if (action === 'opening') {
-            return this.getAverageDuration('topFullOpenDurations');
+            avg = this.getAverageDuration('topFullOpenDurations');
         }
         if (action === 'closing') {
-            return this.getAverageDuration('topFullCloseDurations');
+            avg = this.getAverageDuration('topFullCloseDurations');
         }
-        return 0;
+        return avg > 0 ? Math.max(0, avg - signalDuration) : 0;
     }
     getPositionDelta(prevState, duration) {
         if (isShutterAction(prevState) && duration > 0) {
-            const avg = this.getAverageActionDuration(prevState);
+            const avg = this.getEstimatedActionDuration(prevState);
             if (avg > 0) {
                 return minMaxPercentage(Math.round((duration / avg) * 100));
             }
@@ -205,11 +207,11 @@ export class VeluxShutter {
         else if (position > 0 && position < 100) {
             let timeout = 0;
             if (position > this.position) {
-                timeout = (this.getAverageActionDuration('opening') * (position - this.position)) / 100;
+                timeout = (this.getEstimatedActionDuration('opening') * (position - this.position)) / 100;
                 this.open();
             }
             else {
-                timeout = (this.getAverageActionDuration('closing') * (this.position - position)) / 100;
+                timeout = (this.getEstimatedActionDuration('closing') * (this.position - position)) / 100;
                 this.close();
             }
             if (timeout) {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@uncaught/gpio-shutter-bridge",
   "author": "uncaught <uncaught42@gmail.com>",
   "license": "MIT",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "MQTT shutter bridge for home assistant with Velux KLF 150 support",
   "repository": {
     "type": "git",