minimateplus/blastware_file.py

@@ -677,7 +677,6 @@ def write_blastware_file(
         term_frame  = None
 
     all_bytes = bytearray()
-    seen_metadata = False
 
     for fi, frame in enumerate(body_frames):
         ftype = classify_frame(frame)
@@ -687,30 +686,25 @@ def write_blastware_file(
             # Probe frame: always process regardless of classification.
             # It holds the STRT record; probe_skip positions us past it.
             skip = probe_skip
-        elif seen_metadata:
+        elif ftype == "probe_or_strt":
-            # Drop all frames that come after the compliance/metadata block.
+            # Real duplicate probe frames should be skipped (very rare).
-            # (e.g. extra waveform chunks fetched after stop_after_metadata)
+            log.warning(
-            log.debug(
+                "write_blastware_file: frame %d classified as probe_or_strt — skipping",
-                "write_blastware_file: frame %d after metadata — skipping", fi
+                fi,
             )
             continue
-        elif ftype in ("waveform", "metadata"):
-            skip = 13 if fi == 1 else 12
-            if ftype == "metadata":
-                seen_metadata = True
         else:
-            # Skip probe_or_strt and unknown frames.
+            # Waveform chunks, metadata/compliance frames, and unknown frames are all
-            if b"STRT\xff\xfe" in bytes(frame.data):
+            # included.  The A5 stream is collected with stop_after_metadata=True +
-                log.warning(
+            # extra_chunks_after_metadata=1, so body_frames contains:
-                    "write_blastware_file: frame %d (%s) contains STRT — skipping",
+            #   [0] probe frame
-                    fi, ftype,
+            #   [1..N] waveform ADC chunks
-                )
+            #   [N+1] first compliance frame (contains "Project:", "Client:", etc.)
-            else:
+            #   [N+2] second compliance frame (continuation of compliance block)
-                log.debug(
+            # All of these contribute to the body; the 26-byte footer is separated out
-                    "write_blastware_file: frame %d classified as %s — skipping",
+            # at the end.  Do NOT gate on metadata classification here — the compliance
-                    fi, ftype,
+            # block spans 2 frames and skipping frame N+2 produces a truncated file.
-                )
+            skip = 13 if fi == 1 else 12
-            continue
 
         all_bytes.extend(_frame_body_bytes(frame, skip))