This commit is contained in:
david rice
2026-04-09 09:17:42 +01:00
parent 2385fc6878
commit be7658b54d
5 changed files with 51 additions and 27 deletions

View File

@@ -322,19 +322,18 @@ def dual_capture(iteration):
else:
print(" SKIPPING PASS 3 SAVE.")
# Collect Rigol 1.8 V waveform (Agilent save takes ~5 s, Rigol should be done)
# Collect Rigol 1.8 V waveform.
# The Agilent LP acquire + save takes ~35 s, so the Rigol will have
# long since auto-captured by now. read_waveform_csv() sends :STOP
# before reading to guarantee the acquisition is finalised.
if rigol_scope.is_connected():
print(" PASS 3: WAITING FOR RIGOL 1.8 V CAPTURE...")
if rigol_scope.wait_captured(timeout_s=10.0):
DATA_DIR.mkdir(exist_ok=True)
v18_path = DATA_DIR / f"{ts}_pwr_{iteration:04d}_1v8.csv"
n = rigol_scope.read_waveform_csv(v18_path)
if n:
print(f" SAVED: {v18_path.name} ({n} samples)")
else:
print(" RIGOL: Waveform read returned 0 samples.")
DATA_DIR.mkdir(exist_ok=True)
v18_path = DATA_DIR / f"{ts}_pwr_{iteration:04d}_1v8.csv"
n = rigol_scope.read_waveform_csv(v18_path)
if n:
print(f" SAVED: {v18_path.name} ({n} samples)")
else:
print(" RIGOL: Timed out waiting for capture.")
print(" RIGOL: Waveform read failed — check connection and probe.")
_restore_hs_config()