Merge pull request #456 from NordicSemiconductor/fix/scope-mode-regre…

…ssion Fix/scope mode regression
NordicSemiconductor · Apr 12, 2024 · 7b7a33f · 7b7a33f
2 parents 668c81f + 8d4293e
commit 7b7a33f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/actions/deviceActions.ts b/src/actions/deviceActions.ts
@@ -271,6 +271,10 @@ export const open =
                     cappedValue >= getState().app.trigger.level;
                 prevCappedValue = cappedValue;
 
+                if (!DataManager().isInSync()) {
+                    return;
+                }
+
                 if (!getState().app.trigger.active && validTriggerValue) {
                     if (latestTrigger !== undefined) {
                         return;
@@ -496,11 +500,6 @@ export const processTrigger =
         onProgress?: (message: string, progress?: number) => void
     ): AppThunk<RootState, Promise<void>> =>
     async (dispatch, getState) => {
-        if (!DataManager().isInSync()) {
-            logger.debug('skipping trigger out of sync');
-            return;
-        }
-
         const trigger = DataManager().addTimeReachedTrigger(triggerLength);
 
         const triggerTime = Date.now();

diff --git a/src/globals.ts b/src/globals.ts
@@ -180,7 +180,14 @@ export const DataManager = () => ({
             (options.writeBuffer?.getFirstWriteTime() ??
                 options.fileBuffer?.getFirstWriteTime() ??
                 0);
-        const simulationDelta = getTimestamp() / 1000;
+
+        const processedBytes =
+            options.writeBuffer?.getBytesWritten() ??
+            options.fileBuffer?.getSessionInBytes() ??
+            0;
+
+        const simulationDelta =
+            indexToTimestamp(processedBytes / frameSize - 1) / 1000;
         if (simulationDelta > actualTimePassed) return true;
 
         const pcAheadDelta = actualTimePassed - simulationDelta;

diff --git a/src/utils/WriteBuffer.ts b/src/utils/WriteBuffer.ts
@@ -212,8 +212,8 @@ export class WriteBuffer {
         return this.#pages;
     }
 
-    #calculateWriteIdealBufferRange(bytesToRight: number): Range {
-        const bytesWritten = this.getBytesWritten() + bytesToRight;
+    #calculateWriteIdealBufferRange(bytesToWrite: number): Range {
+        const bytesWritten = this.getBytesWritten() + bytesToWrite;
         const normalizedEnd =
             Math.ceil(bytesWritten / this.#bufferPageSize) *
                 this.#bufferPageSize -