@uncaught/gpio-shutter-bridge 1.2.0 → 1.2.2

package/dist/Shutter/VeluxShutter.d.ts

@@ -1,9 +1,9 @@
 import { Gpio } from 'onoff';
 import { ShutterState, ShutterInterfaceWithState, ShutterInterfaceWithPosition, ShutterPosition } from './Shutter.js';
 interface Durations {
+    bottomSignalDurations?: number[];
     topFullCloseDurations?: number[];
     topFullOpenDurations?: number[];
-    topSignalDurations?: number[];
 }
 export interface Persistence extends Durations {
     position?: number;
@@ -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

@@ -2,6 +2,14 @@ import { Gpio } from 'onoff';
 import { isShutterPosition, isShutterAction, } from './Shutter.js';
 import { press } from '../Gpio.js';
 const durationsToKeep = 20;
+const getBottomDurations = (d) => d.sort((a, b) => a - b).slice(0, durationsToKeep);
+const getLastDurations = (d) => d.slice(-durationsToKeep);
+const getTopDurations = (d) => d.sort((a, b) => b - a).slice(0, durationsToKeep);
+const durationHandlers = {
+    bottomSignalDurations: getBottomDurations,
+    topFullCloseDurations: getTopDurations,
+    topFullOpenDurations: getTopDurations,
+};
 function minMaxPercentage(num) {
     return Math.min(Math.max(num, 0), 100);
 }
@@ -74,10 +82,7 @@ export class VeluxShutter {
     }
     storeDuration(key, duration) {
         if (duration > 0) {
-            //Keep the N longest durations:
-            this.store.set({
-                [key]: [...(this.store.get()[key] ?? []), duration].sort((a, b) => b - a).slice(0, durationsToKeep),
-            });
+            this.store.set({ [key]: durationHandlers[key]([...(this.store.get()[key] ?? []), duration]) });
         }
     }
     getAverageDuration(key) {
@@ -88,18 +93,20 @@ export class VeluxShutter {
         }
         return 0;
     }
-    getAverageActionDuration(action) {
+    getEstimatedActionDuration(action) {
+        const signalDuration = this.getAverageDuration('bottomSignalDurations');
+        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));
             }
@@ -118,7 +125,7 @@ export class VeluxShutter {
             //Measure the time it takes between a manual "stop" and the following stopped signal.
             // This gives us an estimate on how long the KLF 150 takes to send it for any operation.
             const stopDuration = this.lastStoppingStartTime ? Date.now() - this.lastStoppingStartTime : 0;
-            this.storeDuration('topSignalDurations', stopDuration);
+            this.storeDuration('bottomSignalDurations', stopDuration);
         }
         else {
             this.lastStoppingStartTime = 0;
@@ -131,7 +138,7 @@ export class VeluxShutter {
             }
         }
         if (isShutterPosition(state)) {
-            const signalDuration = this.getAverageDuration('topSignalDurations');
+            const signalDuration = this.getAverageDuration('bottomSignalDurations');
             const measuredDuration = this.lastActionStartTime ? Date.now() - this.lastActionStartTime : 0;
             const positionDuration = measuredDuration > 0 ? Math.max(0, measuredDuration - signalDuration) : 0;
             if (state === 'closed') {
@@ -205,11 +212,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.2",
   "description": "MQTT shutter bridge for home assistant with Velux KLF 150 support",
   "repository": {
     "type": "git",