Updates
This commit is contained in:
336
flicker_watch.py
336
flicker_watch.py
@@ -24,10 +24,10 @@ import tty
|
||||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
|
||||
import numpy as np
|
||||
import requests
|
||||
import vxi11
|
||||
|
||||
import ai_mgmt
|
||||
from csv_preprocessor import analyze_lp_file
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
@@ -41,24 +41,45 @@ DATA_DIR = Path(__file__).parent / "data"
|
||||
FLICKER_DIR = DATA_DIR / "flicker"
|
||||
GOOD_DIR = DATA_DIR / "good"
|
||||
|
||||
# LP capture parameters (matched to mipi_test_interactive.py)
|
||||
LP_SCALE = 1e-6 # 1 µs/div → 20 µs window
|
||||
LP_POINTS = 200_000
|
||||
LP_TRIG_OFFSET = 9e-6 # 1 µs pre / 19 µs post-trigger
|
||||
# Trigger mode:
|
||||
# "LP_DAT" — falling-edge on DAT0+ (CH3) crossing 0.6 V. Fires on every
|
||||
# LP-to-HS transition (≈ line rate, 48 kHz). Use to sample
|
||||
# normal MIPI traffic and spot per-burst anomalies.
|
||||
# "CLK_GLITCH" — timeout trigger on CLK+ (CH1) staying HIGH > N ms. Fires
|
||||
# *only* when the clock lane goes LP for longer than expected,
|
||||
# i.e. an actual glitch. Pairs with sn65_monitor.py to
|
||||
# capture the wire-side view of a PLL-unlock event.
|
||||
TRIGGER_MODE = "CLK_GLITCH" # or "LP_DAT"
|
||||
# Increased from 1 ms to 100 ms. Earlier runs at 1 ms triggered on every
|
||||
# V-blank (≈0.5/sec on this display) — far too often to be useful. The
|
||||
# observed PLL-unlock event from sn65_monitor is ~150 ms, so 100 ms
|
||||
# discriminates real unlocks from normal MIPI line/frame breaks.
|
||||
CLK_GLITCH_HIGH_MS = 100.0 # CLK+ HIGH longer than this fires the trigger
|
||||
|
||||
# Capture window
|
||||
# LP_DAT mode: 1 µs/div × 20 div = 20 µs window (50k pts → 5 GSa/s)
|
||||
# CLK_GLITCH: 20 ms/div × 20 div = 400 ms window (200k pts → 500 kSa/s)
|
||||
# wide enough to bracket a 150 ms event with margin on both sides
|
||||
if TRIGGER_MODE == "CLK_GLITCH":
|
||||
LP_SCALE = 20e-3
|
||||
LP_POINTS = 200_000
|
||||
LP_TRIG_OFFSET = 0.0 # centre the trigger so we see before+after
|
||||
SEGMENT_COUNT = 1 # one big window per acquire is plenty
|
||||
else:
|
||||
LP_SCALE = 1e-6
|
||||
LP_POINTS = 50_000
|
||||
LP_TRIG_OFFSET = 9e-6
|
||||
SEGMENT_COUNT = 100
|
||||
|
||||
LP_V_SCALE = 0.2
|
||||
LP_V_OFFSET = 0.6
|
||||
LP_TRIG_LEVEL = 0.6
|
||||
|
||||
# Segmented memory: capture N back-to-back LP triggers per :DIGitize, then
|
||||
# dump the whole acquisition as a single H5 file. Massively higher coverage
|
||||
# than single-shot CSV captures.
|
||||
SEGMENT_COUNT = 100
|
||||
SAVE_FORMAT = "H5" # Keysight native multi-segment format
|
||||
|
||||
CYCLE_S = 10.0 # seconds video is on per cycle
|
||||
# Filling N segments takes ~N × LP-trigger period. LP triggers fire roughly
|
||||
# at line rate (≈48 kHz) so 100 segments fill in ms, but allow margin.
|
||||
TRIG_TIMEOUT_S = max(SEGMENT_COUNT * 0.020 + 5.0, 10.0)
|
||||
CYCLE_S = 10.0
|
||||
# CLK_GLITCH triggers can take many seconds (or never come) — give it the full
|
||||
# cycle. LP_DAT triggers fill 100 segments in well under a second.
|
||||
TRIG_TIMEOUT_S = CYCLE_S - 0.5 if TRIGGER_MODE == "CLK_GLITCH" \
|
||||
else max(SEGMENT_COUNT * 0.020 + 10.0, 15.0)
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Scope setup
|
||||
@@ -67,11 +88,32 @@ scope = vxi11.Instrument(SCOPE_IP)
|
||||
scope.timeout = 30
|
||||
|
||||
|
||||
def _drain_scpi_errors(label: str = "") -> list[str]:
|
||||
"""Pop everything from the scope's error queue; return list of error strings."""
|
||||
errs = []
|
||||
for _ in range(20):
|
||||
try:
|
||||
r = scope.ask(":SYSTem:ERRor?").strip()
|
||||
except Exception:
|
||||
break
|
||||
if not r or r.startswith("0,") or r.startswith("+0,") or r == "0":
|
||||
break
|
||||
errs.append(r)
|
||||
if errs and label:
|
||||
print(f" [{label}] SCPI errors: {errs}")
|
||||
return errs
|
||||
|
||||
|
||||
def setup_scope() -> None:
|
||||
"""One-shot scope init — channels, math, default trigger."""
|
||||
print("CONFIGURING SCOPE...")
|
||||
try:
|
||||
idn = scope.ask("*IDN?").strip()
|
||||
print(f" IDN: {idn}")
|
||||
except Exception as e:
|
||||
print(f" IDN read failed: {e}")
|
||||
cmds = [
|
||||
"*RST", ":RUN", ":STOP",
|
||||
"*RST", ":RUN", ":STOP", "*CLS",
|
||||
":CHANnel1:DISPlay ON", ":CHANnel1:INPut DC50", ":CHANnel1:PROBe 19.2",
|
||||
":CHANnel1:LABel 'CLK+'",
|
||||
":CHANnel2:DISPlay ON", ":CHANnel2:INPut DC50", ":CHANnel2:PROBe 19.2",
|
||||
@@ -88,25 +130,93 @@ def setup_scope() -> None:
|
||||
for c in cmds:
|
||||
scope.write(c)
|
||||
time.sleep(0.05)
|
||||
_drain_scpi_errors("setup_scope")
|
||||
print("SCOPE READY.")
|
||||
|
||||
|
||||
def _read_ieee_block() -> bytes:
|
||||
"""
|
||||
Read an IEEE 488.2 definite-length binary block from the scope:
|
||||
'#' <ndigits> <length> <data> [\\n]
|
||||
"""
|
||||
# Read header: '#' then one digit telling us how many length-digits follow.
|
||||
head = scope.read_raw(2)
|
||||
if not head.startswith(b"#"):
|
||||
# Sometimes vxi11 returns a longer chunk; locate the '#'
|
||||
idx = head.find(b"#")
|
||||
if idx < 0:
|
||||
extra = scope.read_raw(64)
|
||||
head = head + extra
|
||||
idx = head.find(b"#")
|
||||
head = head[idx:idx + 2]
|
||||
ndigits = int(head[1:2])
|
||||
if ndigits == 0:
|
||||
# "#0..." indicates indefinite-length; read until newline.
|
||||
return scope.read_raw().rstrip(b"\r\n")
|
||||
length_bytes = scope.read_raw(ndigits)
|
||||
nbytes = int(length_bytes)
|
||||
data = b""
|
||||
while len(data) < nbytes:
|
||||
chunk = scope.read_raw(nbytes - len(data))
|
||||
if not chunk:
|
||||
break
|
||||
data += chunk
|
||||
# Discard the trailing newline if present
|
||||
try:
|
||||
scope.read_raw(1)
|
||||
except Exception:
|
||||
pass
|
||||
return data
|
||||
|
||||
|
||||
def configure_for_lp() -> None:
|
||||
"""LP-mode + segmented memory: N back-to-back LP triggers per acquisition."""
|
||||
"""LP-mode capture, with trigger configured per TRIGGER_MODE."""
|
||||
for ch in (1, 2, 3, 4):
|
||||
scope.write(f":CHANnel{ch}:SCALe {LP_V_SCALE:.3f}")
|
||||
scope.write(f":CHANnel{ch}:OFFSet {LP_V_OFFSET:.3f}")
|
||||
scope.write(":TRIGger:EDGE:SOURce CHANnel3")
|
||||
scope.write(":TRIGger:EDGE:SLOPe NEGative")
|
||||
scope.write(f":TRIGger:EDGE:LEVel {LP_TRIG_LEVEL:.3f}")
|
||||
|
||||
if TRIGGER_MODE == "CLK_GLITCH":
|
||||
# Pulse-width (GLITch) trigger on the Infiniium A/B (firmware 5.x):
|
||||
# fires at the falling edge of a CH1 (CLK+) HIGH pulse longer than
|
||||
# CLK_GLITCH_HIGH_MS — i.e. CLK held LP-11 for an unusually long time.
|
||||
# The newer :TRIGger:TIMeout:* SCPI is rejected by this scope (-113).
|
||||
_drain_scpi_errors()
|
||||
scope.write(":TRIGger:MODE GLITch")
|
||||
scope.write(":TRIGger:GLITch:SOURce CHANnel1")
|
||||
scope.write(":TRIGger:GLITch:POLarity POSitive")
|
||||
scope.write(":TRIGger:GLITch:DIRection GREaterthan")
|
||||
scope.write(f":TRIGger:GLITch:WIDTh {CLK_GLITCH_HIGH_MS * 1e-3:.3E}")
|
||||
scope.write(f":TRIGger:GLITch:LEVel CHANnel1,{LP_TRIG_LEVEL:.3f}")
|
||||
time.sleep(0.2)
|
||||
errs = _drain_scpi_errors()
|
||||
if errs:
|
||||
print(f" GLITch trigger setup SCPI errors: {errs}")
|
||||
try:
|
||||
mode = scope.ask(":TRIGger:MODE?").strip()
|
||||
w = scope.ask(":TRIGger:GLITch:WIDTh?").strip()
|
||||
print(f" GLITch trigger: mode={mode} CLK+ HIGH > {float(w)*1000:.1f} ms")
|
||||
except Exception as e:
|
||||
print(f" GLITch trigger readback failed: {e}")
|
||||
else:
|
||||
# Edge trigger on falling DAT0+: fires on every LP-to-HS transition.
|
||||
scope.write(":TRIGger:MODE EDGE")
|
||||
scope.write(":TRIGger:EDGE:SOURce CHANnel3")
|
||||
scope.write(":TRIGger:EDGE:SLOPe NEGative")
|
||||
scope.write(f":TRIGger:EDGE:LEVel {LP_TRIG_LEVEL:.3f}")
|
||||
|
||||
scope.write(":TRIGger:SWEep NORMal")
|
||||
scope.write(f":TIMebase:SCALe {LP_SCALE:.3E}")
|
||||
scope.write(f":ACQuire:POINts {LP_POINTS}")
|
||||
scope.write(f":TIMebase:POSition {LP_TRIG_OFFSET:.2E}")
|
||||
# Segmented memory: fill N segments per :DIGitize.
|
||||
scope.write(":ACQuire:MODE SEGMented")
|
||||
scope.write(f":ACQuire:SEGMented:COUNt {SEGMENT_COUNT}")
|
||||
|
||||
if SEGMENT_COUNT > 1:
|
||||
scope.write(":ACQuire:MODE SEGMented")
|
||||
scope.write(f":ACQuire:SEGMented:COUNt {SEGMENT_COUNT}")
|
||||
else:
|
||||
scope.write(":ACQuire:MODE RTIMe")
|
||||
|
||||
time.sleep(0.5)
|
||||
_drain_scpi_errors("configure_for_lp")
|
||||
|
||||
|
||||
def arm_and_wait(timeout_s: float) -> bool:
|
||||
@@ -138,14 +248,69 @@ def arm_and_wait(timeout_s: float) -> bool:
|
||||
pass
|
||||
|
||||
|
||||
def save_lp(base_name: str) -> None:
|
||||
"""Save all N segments of Ch1 (CLK+) and Ch3 (DAT0+) as a single H5 each."""
|
||||
base = f"C:\\TEMP\\{base_name}"
|
||||
ext = SAVE_FORMAT.lower()
|
||||
scope.write(f':DISK:SAVE:WAVeform CHANnel1,"{base}_clk.{ext}",{SAVE_FORMAT}')
|
||||
time.sleep(3.0)
|
||||
scope.write(f':DISK:SAVE:WAVeform CHANnel3,"{base}_dat.{ext}",{SAVE_FORMAT}')
|
||||
time.sleep(3.0)
|
||||
def _fetch_channel_segments(channel: int, n_segments: int):
|
||||
"""
|
||||
Read all segments for one channel via :WAVeform:DATA?. Returns
|
||||
(times_ndarray, list_of_volts_ndarrays). Time axis is shared across all
|
||||
segments. When n_segments == 1 we skip the SEGMented:INDex select since
|
||||
we may be in RTIMe (single-shot) mode rather than SEGMented mode.
|
||||
"""
|
||||
import numpy as np
|
||||
scope.write(f":WAVeform:SOURce CHANnel{channel}")
|
||||
scope.write(":WAVeform:FORMat WORD")
|
||||
scope.write(":WAVeform:BYTeorder LSBFirst")
|
||||
|
||||
x_inc = float(scope.ask(":WAVeform:XINCrement?"))
|
||||
x_org = float(scope.ask(":WAVeform:XORigin?"))
|
||||
y_inc = float(scope.ask(":WAVeform:YINCrement?"))
|
||||
y_org = float(scope.ask(":WAVeform:YORigin?"))
|
||||
|
||||
segs: list = []
|
||||
for i in range(1, n_segments + 1):
|
||||
if n_segments > 1:
|
||||
scope.write(f":ACQuire:SEGMented:INDex {i}")
|
||||
scope.write(":WAVeform:DATA?")
|
||||
raw = _read_ieee_block()
|
||||
codes = np.frombuffer(raw, dtype="<i2")
|
||||
volts = codes.astype(np.float64) * y_inc + y_org
|
||||
segs.append(volts)
|
||||
|
||||
n = len(segs[0]) if segs else 0
|
||||
times = np.arange(n) * x_inc + x_org
|
||||
return times, segs
|
||||
|
||||
|
||||
def save_lp(base_name: str) -> tuple[bool, list[str]]:
|
||||
"""
|
||||
Read all N segments for CLK and DAT directly via VXI-11 binary transfer
|
||||
and write per-segment CSVs locally to DATA_DIR.
|
||||
|
||||
Returns (ok, errs). Filenames match csv_preprocessor's expected pattern:
|
||||
{base_name}_seg{NNN}_{clk|dat}.csv
|
||||
"""
|
||||
import numpy as np
|
||||
_drain_scpi_errors()
|
||||
try:
|
||||
t_clk, clk_segs = _fetch_channel_segments(1, SEGMENT_COUNT)
|
||||
t_dat, dat_segs = _fetch_channel_segments(3, SEGMENT_COUNT)
|
||||
except Exception as e:
|
||||
return (False, [f"fetch error: {e}"])
|
||||
|
||||
errs = _drain_scpi_errors()
|
||||
|
||||
n_written = 0
|
||||
for i, (clk, dat) in enumerate(zip(clk_segs, dat_segs), start=1):
|
||||
clk_path = DATA_DIR / f"{base_name}_seg{i:03d}_clk.csv"
|
||||
dat_path = DATA_DIR / f"{base_name}_seg{i:03d}_dat.csv"
|
||||
np.savetxt(clk_path, np.column_stack([t_clk, clk]),
|
||||
delimiter=",", fmt="%.6e")
|
||||
np.savetxt(dat_path, np.column_stack([t_dat, dat]),
|
||||
delimiter=",", fmt="%.6e")
|
||||
n_written += 1
|
||||
|
||||
if n_written == 0:
|
||||
return (False, errs or ["no segments written"])
|
||||
return (True, errs)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
@@ -186,48 +351,6 @@ def video_stop() -> None:
|
||||
print(f" VIDEO STOP failed: {e}")
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# H5 transfer (ai_mgmt only handles CSV — segmented mode produces .h5)
|
||||
# ---------------------------------------------------------------------------
|
||||
def _transfer_h5_files() -> int:
|
||||
"""SMB-pull every .h5 from the scope share into DATA_DIR; delete on scope."""
|
||||
from smb.SMBConnection import SMBConnection
|
||||
import socket
|
||||
conn = SMBConnection(
|
||||
ai_mgmt.USERNAME, ai_mgmt.PASSWORD,
|
||||
socket.gethostname(), ai_mgmt.SERVER_NAME,
|
||||
use_ntlm_v2=True, is_direct_tcp=True,
|
||||
)
|
||||
if not conn.connect(ai_mgmt.SERVER, 445):
|
||||
print(" H5 transfer: could not connect to scope share")
|
||||
return 0
|
||||
count = 0
|
||||
try:
|
||||
h5_paths: list[str] = []
|
||||
def walk(path: str) -> None:
|
||||
for entry in conn.listPath(ai_mgmt.SHARE, path):
|
||||
if entry.filename in (".", ".."):
|
||||
continue
|
||||
full = f"{path}/{entry.filename}"
|
||||
if entry.isDirectory:
|
||||
walk(full)
|
||||
elif entry.filename.lower().endswith(".h5"):
|
||||
h5_paths.append(full)
|
||||
walk("/")
|
||||
for remote in h5_paths:
|
||||
local = DATA_DIR / Path(remote).name
|
||||
try:
|
||||
with open(local, "wb") as fh:
|
||||
conn.retrieveFile(ai_mgmt.SHARE, remote, fh)
|
||||
conn.deleteFiles(ai_mgmt.SHARE, remote)
|
||||
count += 1
|
||||
except Exception as e:
|
||||
print(f" H5 transfer failed for {Path(remote).name}: {e}")
|
||||
finally:
|
||||
conn.close()
|
||||
return count
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Register snapshot from device (DSIM PHY + SN65DSI83)
|
||||
# ---------------------------------------------------------------------------
|
||||
@@ -297,39 +420,14 @@ def archive_and_analyse(event: str, since_iso: str) -> None:
|
||||
# Register snapshot first (fast, before scope transfer which takes longer)
|
||||
fetch_registers_snapshot(target, event_ts)
|
||||
|
||||
print(f" Transferring scope → {target} ...")
|
||||
try:
|
||||
copied, failed = ai_mgmt.transfer_csv_files()
|
||||
except Exception as e:
|
||||
print(f" TRANSFER ERROR: {e}")
|
||||
return
|
||||
print(f" {copied} file(s) transferred ({failed} failed)")
|
||||
|
||||
# ai_mgmt only fetches CSVs. H5 (segmented) files need a separate pass.
|
||||
h5_count = _transfer_h5_files()
|
||||
if h5_count:
|
||||
print(f" {h5_count} H5 file(s) transferred")
|
||||
|
||||
# Move just-arrived files (csv + h5) out of data/ (flat) into the event folder.
|
||||
# Segment CSVs are already in DATA_DIR (written directly by save_lp via
|
||||
# SCPI binary read). Just move the ones from this event into the folder.
|
||||
moved = 0
|
||||
for f in list(DATA_DIR.glob("*.csv")) + list(DATA_DIR.glob("*.h5")):
|
||||
for f in DATA_DIR.glob("*.csv"):
|
||||
if f.is_file():
|
||||
shutil.move(str(f), target / f.name)
|
||||
moved += 1
|
||||
print(f" {moved} file(s) archived to {target.relative_to(DATA_DIR.parent)}")
|
||||
|
||||
# Explode each H5 into per-segment CSVs so csv_preprocessor can analyse them.
|
||||
from explode_h5 import explode
|
||||
h5_files = sorted(target.glob("*_lp_*.h5"))
|
||||
seg_csv_count = 0
|
||||
for h5 in h5_files:
|
||||
try:
|
||||
csvs = explode(h5)
|
||||
seg_csv_count += len(csvs)
|
||||
except Exception as e:
|
||||
print(f" EXPLODE error on {h5.name}: {e}")
|
||||
if h5_files:
|
||||
print(f" exploded {len(h5_files)} H5 file(s) → {seg_csv_count} segment CSV(s)")
|
||||
print(f" {moved} segment CSV(s) archived to {target.relative_to(DATA_DIR.parent)}")
|
||||
|
||||
if event != "flicker":
|
||||
return
|
||||
@@ -416,9 +514,14 @@ def main() -> None:
|
||||
cycle_end = time.time() + CYCLE_S
|
||||
|
||||
video_start()
|
||||
mode_desc = (
|
||||
f"CLK_GLITCH (CLK+ HIGH > {CLK_GLITCH_HIGH_MS:.1f} ms, "
|
||||
f"{LP_SCALE * 20 * 1000:.0f} ms window)"
|
||||
if TRIGGER_MODE == "CLK_GLITCH"
|
||||
else f"LP_DAT ({SEGMENT_COUNT} segs/acquire)"
|
||||
)
|
||||
print(f"\n[cycle {cycle:03d} {cycle_ts}] video ON "
|
||||
f"({CYCLE_S:.0f}s window, {SEGMENT_COUNT} segs/acquire)",
|
||||
flush=True)
|
||||
f"({CYCLE_S:.0f}s window, {mode_desc})", flush=True)
|
||||
|
||||
event = None
|
||||
last_tick = 0.0
|
||||
@@ -429,16 +532,29 @@ def main() -> None:
|
||||
|
||||
if arm_and_wait(TRIG_TIMEOUT_S):
|
||||
try:
|
||||
save_lp(base)
|
||||
cycle_caps.append(base)
|
||||
print(f" + acq {seq:02d} ({SEGMENT_COUNT} segs) "
|
||||
f"[{remaining():4.1f}s left]", flush=True)
|
||||
ok, errs = save_lp(base)
|
||||
if ok:
|
||||
cycle_caps.append(base)
|
||||
tag = ("CLK GLITCH" if TRIGGER_MODE == "CLK_GLITCH"
|
||||
else f"{SEGMENT_COUNT} segs")
|
||||
print(f" + acq {seq:02d} ({tag}) "
|
||||
f"[{remaining():4.1f}s left]",
|
||||
flush=True)
|
||||
else:
|
||||
print(f" ! acq {seq:02d} SAVE FAILED — "
|
||||
f"{errs[0][:80] if errs else 'unknown'}",
|
||||
flush=True)
|
||||
except Exception as e:
|
||||
print(f" save error: {e}", flush=True)
|
||||
else:
|
||||
# Trigger timed out — print a heartbeat at most every 2s
|
||||
# Trigger timed out — print a heartbeat at most every 2s.
|
||||
# In CLK_GLITCH mode this is the *normal* state: it just
|
||||
# means no glitch happened during this cycle.
|
||||
if time.time() - last_tick > 2.0:
|
||||
print(f" ... waiting for trigger "
|
||||
msg = ("waiting for CLK glitch"
|
||||
if TRIGGER_MODE == "CLK_GLITCH"
|
||||
else "waiting for trigger")
|
||||
print(f" ... {msg} "
|
||||
f"[{remaining():4.1f}s left]", flush=True)
|
||||
last_tick = time.time()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user