Tweaks

Author: macaba

source/TS.NET.Engine/Threads/ProcessingThread.cs

@@ -724,7 +724,7 @@ private static unsafe void Loop(
                                             eventTrigger.EnqueueEvent(eventSampleIndex);
                                         }
 
-                                        eventTrigger.Process(sampleLengthPerChannel, sampleStartIndex, ref eventTriggerResults);
+                                        eventTrigger.Process(sampleLengthPerChannel, sampleStartIndex, acquisitionBuffer.SamplesInBuffer, ref eventTriggerResults);
 
                                         if (eventTriggerResults.CaptureEndCount > 0)
                                         {

source/TS.NET/Processing/Triggers/EventTrigger.cs

@@ -5,6 +5,8 @@ public class EventTrigger : IEventTrigger
     enum TriggerState { Unarmed, InCapture, InHoldoff }
     private TriggerState triggerState = TriggerState.Unarmed;
 
+    private long windowWidth;
+
     private long captureSamples;
     private long captureRemaining;
 
@@ -25,6 +27,8 @@ public void SetHorizontal(long windowWidth, long windowTriggerPosition, long add
         if (windowTriggerPosition > windowWidth - 1)
             windowTriggerPosition = windowWidth - 1;
 
+        this.windowWidth = windowWidth;
+
         captureSamples = windowWidth - windowTriggerPosition;
         captureRemaining = 0;
 
@@ -42,7 +46,7 @@ public void EnqueueEvent(ulong sampleIndex)
         eventQueue.Enqueue(sampleIndex);
     }
 
-    public void Process(int inputLength, ulong sampleStartIndex, ref EventTriggerResults results)
+    public void Process(int inputLength, ulong sampleStartIndex, int acquisitionSamplesInBuffer, ref EventTriggerResults results)
     {
         ulong chunkStart = sampleStartIndex;
         ulong chunkEnd = sampleStartIndex + (ulong)inputLength;
@@ -56,6 +60,7 @@ public void Process(int inputLength, ulong sampleStartIndex, ref EventTriggerRes
             {
                 case TriggerState.Unarmed:
                     {
+
                         // Empty stale events out of queue.
                         // This does limit the scope of triggers to current & future chunks,
                         // when in reality there's a whole acquisition buffer available.
@@ -66,6 +71,13 @@ public void Process(int inputLength, ulong sampleStartIndex, ref EventTriggerRes
                             eventQueue.Dequeue();
                         }
 
+                        // Only allow capture events once at least windowWidth samples have passed
+                        if (acquisitionSamplesInBuffer < windowWidth)
+                        {
+                            i = inputLength;
+                            break;
+                        }
+
                         if (eventQueue.TryPeek(out var eventIndex) && eventIndex >= chunkStart && eventIndex < chunkEnd)
                         {
                             eventQueue.Dequeue();

source/TS.NET/Processing/Triggers/IEventTrigger.cs

@@ -4,5 +4,5 @@ public interface IEventTrigger
 {
     void SetHorizontal(long windowWidth, long windowTriggerPosition, long additionalHoldoff);
     void EnqueueEvent(ulong sampleIndex);
-    void Process(int inputLength, ulong sampleStartIndex, ref EventTriggerResults results);
+    void Process(int inputLength, ulong sampleStartIndex, int acquisitionSamplesInBuffer, ref EventTriggerResults results);
 }