Skip markers for now in MSL

hyper-tuner · Sep 10, 2023 · eafd652 · eafd652
1 parent 608f200
commit eafd652
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/components/Logs/LogCanvas.tsx b/src/components/Logs/LogCanvas.tsx
@@ -168,6 +168,7 @@ const LogCanvas = ({
       selectedFields2.length,
       plotSync.key,
     );
+
     options2 = result2.options;
     plotData2 = [result2.xData, ...result2.yData];
   }

diff --git a/src/utils/logs/MslLogParser.ts b/src/utils/logs/MslLogParser.ts
@@ -1,7 +1,9 @@
-import { Result } from 'mlg-converter/dist/types';
+import { Record, Result, BlockType } from 'mlg-converter/dist/types';
 import { ParserInterface } from '../ParserInterface';
 
 class MslLogParser implements ParserInterface {
+  private markerPrefix = 'MARK';
+
   private raw = '';
 
   private result: Result = {
@@ -32,6 +34,7 @@ class MslLogParser implements ParserInterface {
         continue;
       }
 
+      // header line eg. Time	SD: Present	SD: Logging	triggerScopeReady...
       if (line.startsWith('Time') || line.startsWith('RPM')) {
         unitsIndex = lineIndex + 1;
         const fields = line.split('\t');
@@ -50,15 +53,22 @@ class MslLogParser implements ParserInterface {
         continue;
       }
 
+      // markers: eg. MARK 000
+      if (line.startsWith(this.markerPrefix)) {
+        // TODO: parse markers
+        continue;
+      }
+
       if (lineIndex > unitsIndex) {
+        // data line eg. 215.389	0	0	0	0	0	1	0	1...
         const fields = line.split('\t');
-        const record = {
-          type: 'field' as const,
+        const record: Record = {
+          type: 'field' as BlockType, // TODO: use enum
           timestamp: 0,
         };
 
         fields.forEach((value, fieldIndex) => {
-          (record as any)[this.result.fields[fieldIndex].name] = parseFloat(value);
+          record[this.result.fields[fieldIndex].name] = parseFloat(value);
         });
 
         this.result.records.push(record);

diff --git a/src/workers/logParserWorker.ts b/src/workers/logParserWorker.ts
@@ -58,6 +58,7 @@ ctx.addEventListener('message', ({ data }: { data: ArrayBuffer }) => {
 
     if (logParser.isMSL()) {
       const mslResult = parseMsl(raw, t0);
+
       ctx.postMessage({
         type: 'metrics',
         elapsed: elapsed(t0),