oep-client-python 0.0.45__tar.gz → 0.0.47__tar.gz

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 ## Unreleased
 
+## 0.0.47
+- (EN) Added: `acquire.Request(during=steps)` for a stream in place of `seconds`: it streams until `steps(wait)`
+  returns, `wait(seconds)` collecting while it waits, so a script marks sections and sends ops or console commands on
+  the same session (no second thread or session) while one long capture runs. A loss with on_loss "stop" raises
+  `acquire.StreamStopped` out of `wait`; the stream ends there. An exception of the steps stops the capture and comes out.
+- (JA) 追加: stream の `acquire.Request(during=steps)`（`seconds` の代わり）。`steps(wait)` が戻るまで取り込み、
+  `wait(秒)` の間に受け取る。1 本の長い取り込みの間に、同じセッションで区間の見出しを書き、op やコンソールの命令を送れる
+  （別のスレッドもセッションも要らない）。on_loss "stop" で欠損があると、`wait` から `acquire.StreamStopped` が出て、
+  そこで取り込みを終える。steps の例外は、取り込みを止めてから外に出る。
+- (EN) Added: acquire's channels take a port's line by the target pin, `S@P` (host guide §5.3; `x035@pb9`), besides
+  `S.N` and the probe's channel names.
+- (JA) 追加: acquire のチャネルに、口の線を相手のピンで指す `S@P`（host ガイド §5.3、`x035@pb9`）も使える。`S.N` と
+  プローブのチャネル名に加えて。
+- (EN) CI and the release run the tests four at a time by file (pytest-xdist, a dev dependency): most tests wait on real
+  timeouts, so the run drops from about 6 minutes to about 2.
+- (JA) CI とリリースは、試験をファイルごとに並べて流す（pytest-xdist、開発用の依存）。多くの試験は実際の時間切れを待つので、約 6 分が約 2 分になる。
+
+## 0.0.46
+- (EN) Changed (oep-spec 4d28f24): `SpiController.transfer` and `Pwm.set` read the answer's count n(u8) first, and the
+  virtual bench sends it; the memo's max_objects is read as u16. Registry, documents and vectors synced; the checkers'
+  pins moved after a review (none checks the rules changed).
+- (JA) 変更（oep-spec 4d28f24）: `SpiController.transfer` と `Pwm.set` は応答の頭の件数 n(u8) を読み、仮想のベンチもそれを送る。メモ欄の
+  max_objects は u16 で読む。registry、文書、ベクタを同期した。適合の検査の固定は見直して合わせた（変えた規則を確かめる検査は無い）。
+
 ## 0.0.45
 - (EN) Added: `oep_client.memo` for `oep.probe.memo` (oep-if-memo): list (paged, by prefix), read and write in parts at the
   route's max_frame, delete; a read whose data does not match its crc raises MemoTorn. `oep dump` names the interface and

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: oep-client-python
-Version: 0.0.45
+Version: 0.0.47
 Summary: Open Embedded Probe (OEP) v1 host: serial / USB / TCP transports, the session rules, the standard interfaces, and a virtual bench
 Project-URL: Homepage, https://github.com/Open-Embedded-Probe/oep-client-python
 Project-URL: Repository, https://github.com/Open-Embedded-Probe/oep-client-python

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "oep-client-python"
-version = "0.0.45"
+version = "0.0.47"
 description = "Open Embedded Probe (OEP) v1 host: serial / USB / TCP transports, the session rules, the standard interfaces, and a virtual bench"
 readme = "README.md"
 license = "MIT"
@@ -42,7 +42,7 @@ packages = ["src/oep_client"]
 only-include = ["src/oep_client", "tests", "docs", "udev", "README.md", "README.ja.md", "CHANGELOG.md", "LICENSE", "pyproject.toml"]
 
 [dependency-groups]
-dev = ["pytest>=8"]
+dev = ["pytest>=8", "pytest-xdist>=3"]
 
 [tool.pytest.ini_options]
 markers = ["hw: needs a probe board (OEP_HW_BOARDS=<board-identify ids>); skipped otherwise (tests/hw/README.md)",

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/src/oep_client/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.0.45"
+__version__ = "0.0.47"

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/src/oep_client/acquire.py

@@ -11,14 +11,25 @@ probe's facts out.
 
 Logic channels go to oep.fixture.logic, analog ones to oep.fixture.analog; with both, oep.fixture.capture-group
 starts them together, a trigger on either track as the group's trigger source (capture §4.4). A line is named as a
-script keeps it - the probe's channel name (fn 0's channel_name, core §7.5) or a port's line label (S.N, host guide
-§5.3) - and looked up on the session (a channel number holds for one boot only); a track's channels are its plan roles
+script keeps it - the probe's channel name (fn 0's channel_name, core §7.5) or a port's line label (host guide §5.3:
+S.N by its role, S@P by the target pin) - and looked up on the session (a channel number holds for one boot only); a track's channels are its plan roles
 0..C-1 in the order given. The plans are released afterwards.
 
 Modes: "oneshot" (the probe's memory), "repeat" (`segments` acquisitions read and released as they come: with a
 trigger one part each, layout "segments"; without, a timeline), "stream" (for `seconds`, sent as taken,
 put together on disk while it runs: a timeline, cut where data was lost).
 
+A stream can run while the script does its steps on the same session (marking sections, sending console commands):
+`during=steps` in place of `seconds` streams until steps(wait) returns, `wait(seconds)` collecting while it waits.
+Steps should call wait often (the probe holds only its stream buffer meanwhile); a loss with on_loss "stop" raises
+StreamStopped out of wait, and the stream ends there.
+
+    def steps(wait):
+        for duty in (64, 128):
+            with rec.section(2, f"duty={duty}"):
+                console.write(f"PWM {duty}\n".encode()); wait(0.5)
+    res = acquire.capture(hst, acquire.Request(chans, 1_000_000, 0, mode="stream", during=steps))
+
 Times: tick 0 of a part is its first logic sample, `start_ns` on the probe's clock; an analog channel starts at
 t0_ticks = (its segment's start_ns - that) plus its skew_ns, in ticks. These are the probe's estimates; each track's
 uncertainty is kept. ADC values are kept raw with the probe's linear conversion; the input range, reference, Vrefint
@@ -37,13 +48,14 @@ import array
 import math
 import struct
 import sys
+from collections.abc import Callable
 from dataclasses import dataclass, field
 from fractions import Fraction
 from pathlib import Path
 
 from . import registry as _reg
 
-__all__ = ["Analog", "Bits", "Changes", "OnDisk", "Part", "Request", "Result", "capture", "capture_at"]
+__all__ = ["Analog", "Bits", "Changes", "OnDisk", "Part", "Request", "Result", "StreamStopped", "capture", "capture_at"]
 
 TRIGGERS = ("high", "low", "rise", "fall", "both")
 ANALOG_TRIGGERS = ("high", "low", "rise", "fall")
@@ -52,7 +64,8 @@ ANALOG_TRIGGERS = ("high", "low", "rise", "fall")
 @dataclass
 class Request:
     channels: list[tuple[str, str]]          # logic: (name to record, the line): the probe's channel name (fn 0's
-                                             # channel_name, GPIO47) or a port's line label (S.N, x035.swdio), in order
+                                             # channel_name, GPIO47) or a port's line label (S.N, x035.swdio; S@P,
+                                             # x035@pb9), in order
     rate: int                                # logic samples per second asked for (the probe may answer another)
     samples: int
     trigger: tuple | None = None             # (logic channel, one of TRIGGERS) or (analog channel, rise / fall / high /
@@ -69,6 +82,8 @@ class Request:
     segments: int | None = None              # repeat: how many acquisitions
     on_loss: str = "stop"                    # stream: "stop" at the first loss, or "continue" to the end
     spool_dir: str | None = None             # stream: where its channels are put together on disk while it runs
+    during: Callable[[Callable[[float], None]], None] | None = None   # stream: instead of `seconds`, runs until this
+                                             # returns - called with wait(seconds), which collects while it waits
 
     def __post_init__(self):
         names = [n for n, _ in self.channels] + [n for n, *_ in self.analog]
@@ -92,8 +107,10 @@ class Request:
                 raise ValueError("repeat: logic channels only")
         elif self.segments is not None:
             raise ValueError("segments is for repeat only")
-        if self.mode == "stream" and not (self.seconds and self.seconds > 0):
-            raise ValueError("a stream needs seconds (how long)")
+        if self.during is not None and (self.mode != "stream" or self.seconds is not None):
+            raise ValueError("during is for a stream, in place of seconds")
+        if self.mode == "stream" and self.during is None and not (self.seconds and self.seconds > 0):
+            raise ValueError("a stream needs seconds (how long) or during")
         if self.arm not in ("pretrigger", "now"):
             raise ValueError(f"arm {self.arm!r}: pretrigger or now")
         logic = {n for n, _ in self.channels}
@@ -567,7 +584,8 @@ def _describe(core, hst, fn: int) -> list[tuple[int, bytes]]:
 
 def _channels(core, hst, lines: list[str]) -> list[int]:
     """The probe's channel numbers (valid for this boot) of lines named as kept in scripts: a channel name (fn 0's
-    channel_name, core §7.5; GPIO47) or a port's line label (S.N, host guide §5.3; x035.swdio). ASCII case aside."""
+    channel_name, core §7.5; GPIO47) or a port's line label (host guide §5.3: S.N by its role, x035.swdio; S@P by the target pin, x035@pb9). ASCII
+    case aside."""
     if not lines:
         return []
     from . import registry, settings
@@ -581,11 +599,13 @@ def _channels(core, hst, lines: list[str]) -> list[int]:
     labels = None
     out = []
     for line in lines:
-        port_line = settings.port_line(line)
-        if port_line is not None:
+        label = settings.parse_label(line)
+        if label is not None:
             if labels is None:
                 labels = settings.labels(hst)
-            ch = settings.line_from_labels(labels, port_line[1], port_line[0])
+            port, role, pin = label
+            ch = (settings.line_from_labels(labels, role, port) if role
+                  else settings.pin_from_labels(labels, pin, port))
             if ch is None:
                 raise ValueError(f"{line}: no channel carries that label (host guide §5.3)")
         else:
@@ -1133,6 +1153,35 @@ STREAM_MAX_DELAY_MS = 20  # ... or after this long. With (0, 0) the P4X sent eac
                           # quiet lines) as a transfer of its own, 2000 a second, and dropped 35 % it could not send
 
 
+class StreamStopped(Exception):
+    """Raised by a stream's `wait` (Request.during) when data was lost and on_loss is "stop": the stream stops there."""
+
+
+def _drive(req: Request, poll, lost) -> None:
+    """Collect a started stream: for req.seconds, or while req.during(wait) runs - its `wait(seconds)` collecting
+    meanwhile. poll(seconds) takes what comes, lost() says whether anything was lost; with on_loss "stop" a loss ends
+    it (a StreamStopped out of wait, caught here)."""
+    import time
+
+    def wait(seconds: float) -> None:
+        deadline = time.monotonic() + seconds
+        while True:
+            now = time.monotonic()
+            if now >= deadline:
+                return
+            poll(min(STREAM_POLL_S, deadline - now))
+            if req.on_loss == "stop" and lost():
+                raise StreamStopped("data was lost while streaming")
+
+    try:
+        if req.during is None:
+            wait(req.seconds)
+        else:
+            req.during(wait)
+    except StreamStopped:
+        pass
+
+
 def _collect_group(group, tracks, link, req: Request, oc, spool=None):
     """_collect for a group's streaming tracks (capture §4.1: each subscribed, started at once): -> ({fn: Received},
     seconds). The first track's Received goes to the spool as it comes; a loss in any track stops it with "stop"."""
@@ -1141,20 +1190,22 @@ def _collect_group(group, tracks, link, req: Request, oc, spool=None):
         t.subscribe(STREAM_MIN_BYTES, STREAM_MAX_DELAY_MS)
     group.start(tracks)
     t_read = time.monotonic()
-    deadline, got = t_read + req.seconds, {t.fn: oc.Received() for t in tracks}
+    got = {t.fn: oc.Received() for t in tracks}
     lead = tracks[0].fn
-    while True:
-        now = time.monotonic()
-        if now >= deadline:
-            break
-        got = group.stream(link, tracks, seconds=min(STREAM_POLL_S, deadline - now), into=got)
+
+    def poll(seconds):
+        group.stream(link, tracks, seconds=seconds, into=got)
         if spool is not None:
             spool.take(got[lead])
-        lost = (spool is not None and spool.lost) or any(
+
+    def lost():
+        return (spool is not None and spool.lost) or any(
             g.gaps or (g.start or 0) > 0 for fn, g in got.items() if spool is None or fn != lead)
-        if req.on_loss == "stop" and lost:
-            break
-    group.stop()
+
+    try:
+        _drive(req, poll, lost)
+    finally:
+        group.stop()                             # also when the caller's `during` raised: the probe is left stopped
     got = group.finish(link, tracks, got)
     return got, time.monotonic() - t_read
 
@@ -1182,25 +1233,26 @@ def _analog_runs(an, acfg, got) -> tuple[list, list]:
 
 
 def _collect(track, link, req: Request, oc, spool=None):
-    """Subscribe, start, collect for req.seconds, stop and collect the rest -> (Received, seconds). A loss stops it
-    at once with on_loss "stop"."""
+    """Subscribe, start, collect for req.seconds (or while req.during runs), stop and collect the rest -> (Received,
+    seconds). A loss stops it at once with on_loss "stop"."""
     import time
     track.subscribe(STREAM_MIN_BYTES, STREAM_MAX_DELAY_MS)   # batched: a capture wants bandwidth, not a frame per block
     track.start()
     t_read = time.monotonic()
-    deadline, got = t_read + req.seconds, oc.Received()
-    while True:                                  # stream() renews the lease across calls on the same Received
-        now = time.monotonic()
-        if now >= deadline:
-            break
-        got = track.stream(link, seconds=min(STREAM_POLL_S, deadline - now), into=got)
+    got = oc.Received()
+
+    def poll(seconds):                           # stream() renews the lease across calls on the same Received
+        track.stream(link, seconds=seconds, into=got)
         if spool is not None:                    # put together as it comes: memory holds a poll's worth, not the stream
             spool.take(got)
-            if req.on_loss == "stop" and spool.lost:
-                break
-        elif req.on_loss == "stop" and (got.gaps or (got.start or 0) > 0):
-            break
-    track.stop()
+
+    def lost():
+        return spool.lost if spool is not None else bool(got.gaps or (got.start or 0) > 0)
+
+    try:
+        _drive(req, poll, lost)
+    finally:
+        track.stop()
     got = track.finish(link, got)
     return got, time.monotonic() - t_read
 

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/src/oep_client/conformance/__init__.py

@@ -145,7 +145,7 @@ def checker_sources_sha256():
             for name in CHECKER_SOURCES}
 
 
-REVIEWED_CORE_SHA256 = 'b90ae1b15f10442ff411929e80d8457e754d5f11f227167d3c142f54ff14768a'   # oep-spec docs/oep-core.ja.md
+REVIEWED_CORE_SHA256 = '0408d232e728bb9692ab1c24cefa1fdbf109c35aeebd378034d86c0f4d19789a'   # oep-spec docs/oep-core.ja.md
 
 
 def require_reviewed_contract(registry, spec=None):

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/src/oep_client/conformance/capture_serial.py

@@ -17,7 +17,7 @@ def refused_stale(reply):
     return reply[3:5]==b'\0\4' and refusal_carries('unavailable',reply[5:],b'\1\1\0\6')
 from .host_deadline import reviewed_identity as core_identity
 
-REVIEWED={'interfaces/oep-if-capture.ja.md':'9bab21bc5e8cdf069448dea059af459b6d7a46757554ca7aee4196b04e1dccd6',
+REVIEWED={'interfaces/oep-if-capture.ja.md':'786bf349dfe322cee7b0d13e9d250cee2d0778bef3590ae751b2e87b11bb2fd3',
           'interfaces/oep-if-common.ja.md':'25fed0b1b8b7f246a8b71d02cea810249803b1c3c1e9c3df466c04f38687f70c'}
 
 def reviewed_identity(path):

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/src/oep_client/conformance/core_smoke.py

@@ -8,7 +8,7 @@ import struct
 from . import ops, require, tlvs
 from .. import conformance as _helpers
 
-REVIEWED_CORE_SHA256 = 'b90ae1b15f10442ff411929e80d8457e754d5f11f227167d3c142f54ff14768a'  # oep-spec docs/oep-core.ja.md
+REVIEWED_CORE_SHA256 = '0408d232e728bb9692ab1c24cefa1fdbf109c35aeebd378034d86c0f4d19789a'  # oep-spec docs/oep-core.ja.md
 
 
 class CoreSmokeChecks:

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/src/oep_client/conformance/host_core.py

@@ -4,7 +4,7 @@ from pathlib import Path
 import struct
 from . import require,spec_identity
 
-REVIEWED_CORE_SHA256='b90ae1b15f10442ff411929e80d8457e754d5f11f227167d3c142f54ff14768a'
+REVIEWED_CORE_SHA256='0408d232e728bb9692ab1c24cefa1fdbf109c35aeebd378034d86c0f4d19789a'
 CORE_OPS={'confirm':1,'list':2,'describe':3,'clock':4,'open':16,'end':17,'keepalive':18,'lock_state':19}
 # the settings' ops (core §13.5 / §13.7, transports §7.3): their numbers reviewed, their results not read here
 SETTINGS_OPS={'get':32,'set':33,'unset':34,'save':35,'state':36,'network':37}

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/src/oep_client/conformance/host_deadline.py

@@ -9,7 +9,7 @@ from pathlib import Path
 from . import require,spec_identity
 
 
-REVIEWED={'docs/oep-core.ja.md':'b90ae1b15f10442ff411929e80d8457e754d5f11f227167d3c142f54ff14768a',
+REVIEWED={'docs/oep-core.ja.md':'0408d232e728bb9692ab1c24cefa1fdbf109c35aeebd378034d86c0f4d19789a',
           'docs/oep-transports.ja.md':'2e99bf8039a3d8f5b55c80b66ac97ac40ddf7ad4711079177ffc947c5790103f'}
 QUICK_MS=1000  # core_quick_op_max_ms
 

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/src/oep_client/conformance/host_requests.py

@@ -11,12 +11,12 @@ from . import require, spec_identity
 
 REVIEWED = {
     'interfaces/oep-if-plan.ja.md': 'da8bd60af53499573c07bc33dbd8c4df93eb61a93b91dc57907f26620ae36bbf',
-    'interfaces/oep-if-fixture.ja.md': '53c81882c1789f4e5dd055977066ebd1dedc6c282d772218e85a402a1ba65d39',
-    'docs/oep-core.ja.md': 'b90ae1b15f10442ff411929e80d8457e754d5f11f227167d3c142f54ff14768a',
+    'interfaces/oep-if-fixture.ja.md': '777a972349a14d1efa6e4575d3118b4e0566b81a6f22320401d529e4dca585f1',
+    'docs/oep-core.ja.md': '0408d232e728bb9692ab1c24cefa1fdbf109c35aeebd378034d86c0f4d19789a',
     'interfaces/oep-if-debug.ja.md': '1f490ab984c5820b29acfee923b9400849a3d0011c9ed6bb7144397d8dd29d38',
-    'interfaces/oep-if-capture.ja.md': '9bab21bc5e8cdf069448dea059af459b6d7a46757554ca7aee4196b04e1dccd6',
+    'interfaces/oep-if-capture.ja.md': '786bf349dfe322cee7b0d13e9d250cee2d0778bef3590ae751b2e87b11bb2fd3',
 }
-REVIEWED_REGISTRY_SHA256='46c9da661fcdf07b68e1240bcf03320673d7b418882f3481863e58d2843d00a1'
+REVIEWED_REGISTRY_SHA256='5fccf16a1d0ea2857834f2f4d83deca2294b3d5ef65b80e06a3b9020f78224ae'
 
 
 def reviewed_identity(spec):

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/src/oep_client/conformance/host_wait.py

@@ -6,7 +6,7 @@ from .. import registry as _reg
 SAVE=_reg.CORE.op['save']  # fn 0's save (core §13.7)
 
 
-REVIEWED={'docs/oep-core.ja.md':'b90ae1b15f10442ff411929e80d8457e754d5f11f227167d3c142f54ff14768a',
+REVIEWED={'docs/oep-core.ja.md':'0408d232e728bb9692ab1c24cefa1fdbf109c35aeebd378034d86c0f4d19789a',
           'docs/oep-transports.ja.md':'2e99bf8039a3d8f5b55c80b66ac97ac40ddf7ad4711079177ffc947c5790103f'}
 QUICK_MS=1000  # core_quick_op_max_ms
 

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/src/oep_client/conformance/oep_smoke.py

@@ -7,7 +7,7 @@ import struct
 from . import ops, require, tlvs
 
 REVIEWED_INTERFACES = {  # oep-spec interfaces/
-    'oep-if-fixture.ja.md': '53c81882c1789f4e5dd055977066ebd1dedc6c282d772218e85a402a1ba65d39',
+    'oep-if-fixture.ja.md': '777a972349a14d1efa6e4575d3118b4e0566b81a6f22320401d529e4dca585f1',
     'oep-if-plan.ja.md': 'da8bd60af53499573c07bc33dbd8c4df93eb61a93b91dc57907f26620ae36bbf',
     'oep-if-debug.ja.md': '1f490ab984c5820b29acfee923b9400849a3d0011c9ed6bb7144397d8dd29d38',
     'oep-if-common.ja.md': '25fed0b1b8b7f246a8b71d02cea810249803b1c3c1e9c3df466c04f38687f70c',

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/src/oep_client/fixture.py

@@ -559,8 +559,11 @@ class SpiController(_TargetDeclarations, Interface):
 
     def transfer(self, items: list[SpiItem]) -> list[SpiDone]:
         rd = m.Reader(self._call(self.TRANSFER, self.transfer_body(items)).payload)
+        n = rd.u8()                                        # the answer's count (core §2.3)
+        if n != len(items):
+            raise m.ProtocolError(f"spi-controller transfer: {n} answered for {len(items)} asked")
         done = []
-        for _ in items:
+        for _ in range(n):
             gap, setup, hold = rd.take("III")
             done.append(SpiDone(gap_ns=gap, setup_ns=setup, hold_ns=hold, rx=rd.counted("H")))
         rd.tail()
@@ -631,7 +634,10 @@ class Pwm(_TargetDeclarations, Interface):
         """(role, hz, duty) each, in order -> what the probe made of each."""
         body = struct.pack("<B", len(outputs)) + b"".join(struct.pack("<BIH", r, hz, d) for r, hz, d in outputs)
         rd = m.Reader(self._call(self.SET, body).payload)
-        made = self._outputs(rd, len(outputs))
+        n = rd.u8()                                        # the answer's count (core §2.3)
+        if n != len(outputs):
+            raise m.ProtocolError(f"pwm set: {n} answered for {len(outputs)} asked")
+        made = self._outputs(rd, n)
         rd.tail()
         return made
 

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/src/oep_client/interfaces.py

@@ -129,7 +129,7 @@ KNOWN: dict[str, Known] = {
     "oep.probe.link": Known("the link test (source, sink) and, when its ops offer it, port_speed on a UART bridge"),
     "oep.probe.memo": Known("the memo area: named objects the host keeps on the probe (list, read, write, delete)",
                             tags=_d("oep.probe.memo", ("max_object", "max object bytes", _u32),
-                                    ("max_objects", "max objects", _u32))),
+                                    ("max_objects", "max objects", _u16))),
     "oep.probe.plan": Known("the plan: which channel each role of an interface uses (plan_apply, plan_release)",
                             tags=_d("oep.probe.plan", ("plan_roles", "plan roles", _u32))),
     "oep.probe.restart": Known("the probe restarts itself, answering first",

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/src/oep_client/memo.py

@@ -51,7 +51,7 @@ class Memo:
         self.fn = core.find(hst, _R.name) if fn is None else fn
         found = dict(core.describe(hst, self.fn))
         self.max_object = struct.unpack("<I", found[_R.tlv["describe"]["max_object"]])[0]
-        self.max_objects = struct.unpack("<I", found[_R.tlv["describe"]["max_objects"]])[0]
+        self.max_objects = struct.unpack("<H", found[_R.tlv["describe"]["max_objects"]])[0]
 
     def _frame(self) -> int:
         return getattr(self.h.link, "max_frame", reg.MIN_MAX_FRAME)

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/src/oep_client/registry.py

@@ -3,7 +3,7 @@
 
 from types import SimpleNamespace as _NS
 
-REGISTRY_HASH = "46c9da661fcdf07b"
+REGISTRY_HASH = "5fccf16a1d0ea285"
 SCHEMA = 1
 PROTOCOL_REVISION = 1
 CONFIRM_REQUEST_MAGIC = 'OEP?'

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/src/oep_client/virtual_fixture_drive.py

@@ -305,7 +305,7 @@ class FixtureDrive:
             if nanos // 1_000_000 > MAX_OP_MS:
                 raise unsupported_fixed()
             up = lambda ns: -(-ns // step) * step                  # noqa: E731  the nearest step at or above
-            out = b""
+            out = bytes([n])                                       # n first (core §2.3)
             for k, (gap, setup, hold, tx) in enumerate(items):
                 wire = bytes(reverse_bits(b) for b in tx) if st.bit_order else tx      # the order on MOSI (§4)
                 miso = self.spi_device[fn](st.mode, wire)[:len(tx)] if tx else b""
@@ -336,7 +336,7 @@ class FixtureDrive:
                 raise unsupported_fixed()
             if any(r not in planned for r in roles):
                 raise unavailable("wrong_state")
-            out = b""
+            out = bytes([n])                                       # n first (core §2.3)
             for role, hz, duty in rows:
                 if hz == 0:
                     made = (0, 1, 0)                               # stopped: the line driven low

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/tests/spec/DOCS_SHA256

@@ -1,13 +1,13 @@
-b90ae1b15f10442ff411929e80d8457e754d5f11f227167d3c142f54ff14768a  docs/oep-core.ja.md
+0408d232e728bb9692ab1c24cefa1fdbf109c35aeebd378034d86c0f4d19789a  docs/oep-core.ja.md
 2e99bf8039a3d8f5b55c80b66ac97ac40ddf7ad4711079177ffc947c5790103f  docs/oep-transports.ja.md
 a07e3517fe65e53b669307458dd9698dbf8c7e28801b5ebfd14954f776afe4d9  interfaces/README.ja.md
-9bab21bc5e8cdf069448dea059af459b6d7a46757554ca7aee4196b04e1dccd6  interfaces/oep-if-capture.ja.md
+786bf349dfe322cee7b0d13e9d250cee2d0778bef3590ae751b2e87b11bb2fd3  interfaces/oep-if-capture.ja.md
 25fed0b1b8b7f246a8b71d02cea810249803b1c3c1e9c3df466c04f38687f70c  interfaces/oep-if-common.ja.md
 f3f93a8943ca03a8c5d605d88425088420e1028753118c2c25c3ecfa037a9b54  interfaces/oep-if-console.ja.md
 1f490ab984c5820b29acfee923b9400849a3d0011c9ed6bb7144397d8dd29d38  interfaces/oep-if-debug.ja.md
-53c81882c1789f4e5dd055977066ebd1dedc6c282d772218e85a402a1ba65d39  interfaces/oep-if-fixture.ja.md
+777a972349a14d1efa6e4575d3118b4e0566b81a6f22320401d529e4dca585f1  interfaces/oep-if-fixture.ja.md
 81d5f8ae9a556f0588373494f6c97ecf1df630c7c03d83e7e83c7260d320505a  interfaces/oep-if-link.ja.md
-396de65c2f5e654edd70677bb8bf0dfc758d775070da32a79a7a0612152cf6b3  interfaces/oep-if-memo.ja.md
+2b6082c9cd125afd1353259714c9716f1518a06a308ba30fc2589a0531b50eb2  interfaces/oep-if-memo.ja.md
 da8bd60af53499573c07bc33dbd8c4df93eb61a93b91dc57907f26620ae36bbf  interfaces/oep-if-plan.ja.md
 c1925c4c23f97476725b1f8a18b91ba88f15ed0db9e790dbce81d4d17ca961ea  interfaces/oep-if-restart.ja.md
 35cabaff444b53f30fc390be4dd0bcc394709de790f88cb5f9404ddc0833aeb6  interfaces/target-console-dmseq.ja.md

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/tests/spec/oep-v1.toml

@@ -347,7 +347,7 @@ op = [
 ]
 [interface.tlv.describe]
 max_object = 0x40               # u32, required, >= 1: the longest data of one object (oep-if-memo §1)
-max_objects = 0x41              # u32, required, >= 1: the objects held at once (oep-if-memo §1)
+max_objects = 0x41              # u16, required, >= 1: the objects held at once (oep-if-memo §1)
 
 [[interface]]
 name = "oep.probe.link"                # optional: the link test and a UART bridge's speed for a session (oep-if-link)

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/tests/test_acquire.py

@@ -86,6 +86,35 @@ def test_a_stream_is_put_together_on_a_timeline(probe, tmp_path):
     assert n > 0 and all(isinstance(c, acquire.Bits) for p in res.parts for c in p.channels)
 
 
+def test_a_stream_runs_while_the_caller_works_on_the_same_session(probe, tmp_path):
+    hst = link.open_host(probe())
+    try:
+        core.take(hst, 30_000, owner="test")
+        seen = []
+
+        def steps(wait):                                   # sections: a request on the session, then collect meanwhile
+            for _ in range(3):
+                seen.append(hst.clock_best(2).uptime_ns)
+                wait(0.1)
+        req = acquire.Request([("A", "GPIO10")], 1_000_000, 0, mode="stream", during=steps, spool_dir=str(tmp_path))
+        res = acquire.capture(hst, req)
+        assert res.complete and res.parts and len(seen) == 3 and seen == sorted(seen)
+        assert sum(p.channels[0].n for p in res.parts) > 0
+        with pytest.raises(RuntimeError):                  # the caller's own failure stops the stream and comes out
+            acquire.capture(hst, acquire.Request([("A", "GPIO10")], 1_000_000, 0, mode="stream",
+                                                 during=lambda wait: (wait(0.05), (_ for _ in ()).throw(RuntimeError()))))
+        assert acquire.capture(hst, acquire.Request([("A", "GPIO10")], 1_000_000, 0, mode="stream", seconds=0.1)).complete
+    finally:
+        hst.end()
+        hst.link.close()
+
+
+def test_during_is_for_a_stream_in_place_of_seconds():
+    for kw in ({"mode": "oneshot"}, {"mode": "stream", "seconds": 1.0}):
+        with pytest.raises(ValueError):
+            acquire.Request([("A", "GPIO10")], 1_000_000, 100, during=lambda wait: None, **kw)
+
+
 def test_format_1_lines_as_their_changes(probe):
     req = acquire.Request([("A", "GPIO10"), ("B", "GPIO11")], 20_000_000, 1000, resolution={"B": 1})
     res = acquire.capture_at(probe(), req)
@@ -128,10 +157,10 @@ def test_probe_clock_against_the_host():
 
 
 def test_lines_are_named_by_channel_name_or_label(probe):
-    src = probe("--label", "13=bus.sda")
-    res = acquire.capture_at(src, acquire.Request([("D", "bus.SDA"), ("E", "gpio11")], 20_000_000, 100))
-    assert [c.acquisition["pin"] for c in res.channels] == [13, 11]          # the label's channel; names any case
-    assert res.meta["probe_channels"] == {"D": 13, "E": 11}
+    src = probe("--label", "13=bus.sda", "--label", "12=bus@PB9")
+    res = acquire.capture_at(src, acquire.Request([("D", "bus.SDA"), ("E", "gpio11"), ("F", "BUS@pb9")], 20_000_000, 100))
+    assert [c.acquisition["pin"] for c in res.channels] == [13, 11, 12]      # by role, by name, by the target pin (S@P)
+    assert res.meta["probe_channels"] == {"D": 13, "E": 11, "F": 12}
     with pytest.raises(ValueError, match="no channel of that name"):
         acquire.capture_at(probe(), acquire.Request([("A", "10")], 20_000_000, 100))     # a number is not a name
     with pytest.raises(ValueError, match="no channel carries that label"):

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/tests/test_memo.py

@@ -74,7 +74,7 @@ def probe(monkeypatch):
     fake = FakeProbe()
     monkeypatch.setattr(core, "find", lambda hst, name, revision=None: 7)
     monkeypatch.setattr(core, "describe", lambda hst, fn=0: [(TLV["max_object"], struct.pack("<I", 2048)),
-                                                              (TLV["max_objects"], struct.pack("<I", 64))])
+                                                              (TLV["max_objects"], struct.pack("<H", 64))])
     return fake
 
 

oep_client_python-0.0.47/tests/vectors/SPEC_COMMIT

@@ -0,0 +1 @@
+98e7f5e1845318947442ca1cf0898d4b6747f0ac

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/tests/vectors/SPEC_SHA256

@@ -1,6 +1,6 @@
-4c1e6ea7dd919fbe8ca93da289f2f10448f9c79680941ff95cd8d89a18a64e85  src/oep_client/registry.py
-46c9da661fcdf07b68e1240bcf03320673d7b418882f3481863e58d2843d00a1  tests/spec/oep-v1.toml
-75f36d5439da7dbf7586c937d90bf08c1bfcebc8873f6913970f7336e6955ba0  tests/vectors/capture_formats.json
+cd64ffc25290d00c1eb7b8406e6fd219aac18d14f5a1702f284744c54249fa9c  src/oep_client/registry.py
+5fccf16a1d0ea2857834f2f4d83deca2294b3d5ef65b80e06a3b9020f78224ae  tests/spec/oep-v1.toml
+92c74f42bbf8949e77b16e76e9526ba4242f3255a6d1b1400e9cc7448ecd11cd  tests/vectors/capture_formats.json
 546ddf20d11b86faa23afe2fa1e3c38c514c157db4d5a5c8d92edf48647d61f1  tests/vectors/checks.json
 9950576fcf803299386d0b2e61bf154402f306102311312d49dec6a87a34ced5  tests/vectors/cobs.json
 c981ca124e3393ba68ce3ce3ee92970827f399202c7688bb6e02b66bb6190806  tests/vectors/confirm.json
@@ -12,7 +12,7 @@ c981ca124e3393ba68ce3ce3ee92970827f399202c7688bb6e02b66bb6190806  tests/vectors/
 dc69237eba40e132086806b140453bbd3f58c45b4820a3a927919c1d94d36ab8  tests/vectors/interface_boundaries.json
 2f3028f5b0a3dc764e28c535bdb2b55d7460e39a250bda8e0a27d5f980c57b57  tests/vectors/interface_profiles.json
 8309e40482373ccd3c063ff406befca71a033efffda5894b13d378cb7b6b13f7  tests/vectors/logic_layout.json
-cbf4af0cab979ef7570d68316a13172ed8033c85dfcec9638d4c7861923ed0a5  tests/vectors/ops.json
+3588a7ebed318fc268b59a011a2461a257d89f35044ff3055c7c6e35c76219cc  tests/vectors/ops.json
 0e29a578ef94464df23b6084776e25734900824fdc5d098c7bb78e9cf2c1ff41  tests/vectors/ops_encoding.json
 a46d0cba21bf37bfaf9c1f6427c43320cc1f3f62e80e3f0633e9811bb3de62ec  tests/vectors/refusals.json
 18e660de3901184988d9af52865a81565e1006542eef8985d15553be0a2ff33e  tests/vectors/sessions.json

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/tests/vectors/capture_formats.json

@@ -1,5 +1,5 @@
 {
-  "about": "capture data formats and the trigger expression. Vectors fix fallback to the required blocks only (a probe may fall back earlier; a host reads the header). logic: per segment the raw / events channels' levels, the fallback chosen per block, the stream. analog: values per channel, the stream. trigger: bind TLVs.",
+  "about": "capture data formats and the trigger expression. A block falls back exactly when a channel's events pass L / 8 bytes (capture §1.3). logic: per segment the raw / events channels' levels, the fallback chosen per block, the stream. analog: values per channel, the stream. trigger: bind TLVs.",
   "logic_blocks": [
     {
       "name": "raw and events mixed: a raw channel and a D 4 events channel",

{oep_client_python-0.0.45 → oep_client_python-0.0.47}/tests/vectors/ops.json

@@ -1748,7 +1748,7 @@
       },
       "state": "session S; fn 17 has roles 0 and 1 planned; the probe makes 1 kHz exactly and 32767 of 65535 as 32768",
       "request_hex": "01a900110010443322110200e8030000ff7f01000000000000",
-      "answer_hex": "02a900010000e80300000100000000800100000000010000000000"
+      "answer_hex": "02a90001000200e80300000100000000800100000000010000000000"
     },
     {
       "name": "pwm set: a role past channels is unsupported",
@@ -1818,7 +1818,7 @@
       },
       "state": "session S; configured mode 0 MSB first; time_step_ns 25; the target answers 0x5A then 0x00 0xFF; the first transfer's gap is 0",
       "request_hex": "01a700100011443322110200000000e8030000f401000001009fda070000e8030000f401000002000102",
-      "answer_hex": "02a700010000000000e8030000f401000001005ae9070000e8030000f4010000020000ff"
+      "answer_hex": "02a70001000200000000e8030000f401000001005ae9070000e8030000f4010000020000ff"
     },
     {
       "name": "spi-controller transfer: n 0 is malformed",

oep_client_python-0.0.45/tests/vectors/SPEC_COMMIT

@@ -1 +0,0 @@
-2cd20aa77fbe4eda9bc48e7b4d5e125fcf4ce538