oep-client-python 0.0.11__tar.gz → 0.0.12__tar.gz

{oep_client_python-0.0.11 → oep_client_python-0.0.12}/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 0.0.12
+- (EN) `LogicCapture.force()`: waiting for the trigger, start now. `wait()` keeps the lock alive while it waits (`keepalive_s`, default 1 s): a trigger may come later than the lease.
+- (JA) `LogicCapture.force()`: トリガを待っていれば、今すぐ始める。`wait()` は待つ間ロックを保つ（`keepalive_s`、既定 1 秒）。トリガはリースより後に来ることがある。
+
 ## 0.0.11
 - (EN) The fake analog declares its 16-bit slots as bit 4 of the channels tag (bit i = 2^i, oep-if-capture §3.5).
 - (JA) 偽の probe のアナログは、16 ビットの枠を channels の tag のビット 4 で宣言する（ビット i = 2^i、oep-if-capture §3.5）。

{oep_client_python-0.0.11 → oep_client_python-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: oep-client-python
-Version: 0.0.11
+Version: 0.0.12
 Summary: Open Embedded Probe (OEP) v1 host: serial / USB / TCP transports, the session rules, the standard interfaces, and a fake probe
 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.11 → oep_client_python-0.0.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "oep-client-python"
-version = "0.0.11"
+version = "0.0.12"
 description = "Open Embedded Probe (OEP) v1 host: serial / USB / TCP transports, the session rules, the standard interfaces, and a fake probe"
 readme = "README.md"
 license = "MIT"

{oep_client_python-0.0.11 → oep_client_python-0.0.12}/src/oep_client/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.0.11"
+__version__ = "0.0.12"

{oep_client_python-0.0.11 → oep_client_python-0.0.12}/src/oep_client/capture.py

@@ -287,6 +287,10 @@ class LogicCapture(Interface):
     def stop(self) -> None:
         self._call(self.STOP)
 
+    def force(self) -> None:
+        """Waiting for the trigger: start now (the segment's trigger_index marks where)."""
+        self._call(self.FORCE)
+
     def status(self) -> tuple[int, int, int, int]:
         """-> state, segments done, write position, flags."""
         return m.Reader(self._call(self.STATUS, locked=False).payload).take("BIQB")
@@ -301,10 +305,15 @@ class LogicCapture(Interface):
         rd.tail()
         return out
 
-    def wait(self, timeout: float = 5.0) -> list[Segment]:
-        """Poll status until the one-shot is done (or failed). -> its segments."""
+    def wait(self, timeout: float = 5.0, keepalive_s: float = 1.0) -> list[Segment]:
+        """Poll status until the one-shot is done (or failed). -> its segments. Waiting for a trigger may take longer
+        than the lease: the lock is kept alive every `keepalive_s` (status needs no lock, so it does not)."""
         deadline = time.monotonic() + timeout
+        kept = time.monotonic()
         while time.monotonic() < deadline:
+            if keepalive_s and self.host.session is not None and time.monotonic() - kept >= keepalive_s:
+                self.host.keepalive()
+                kept = time.monotonic()
             state = self.status()[0]
             if state == STATE["done"]:
                 return self.segments()

{oep_client_python-0.0.11 → oep_client_python-0.0.12}/tests/test_fake_capture.py

@@ -75,6 +75,19 @@ def test_a_trigger_is_where_the_channel_does_it(kind, role, value, index):
     assert seg.trigger_index == index
 
 
+
+def test_force_is_accepted_and_wait_keeps_the_lock():
+    ep, hst, lc, clock = bench()
+    core.plan_apply(hst, [(lc.fn, 0, 20), (lc.fn, 1, 21)])
+    lc.configure(rate=1_000_000, samples=64, trigger=(c.EDGE, 1, 1))
+    lc.start()
+    lc.force()                                  # the fake finds its trigger at start: nothing is waiting
+    sent = []
+    keepalive = hst.keepalive
+    hst.keepalive = lambda: (sent.append(1), keepalive())
+    (seg,) = lc.wait(keepalive_s=1e-9)
+    assert sent and seg.trigger_index is not None
+
 def test_slipped_segments_say_so():
     ep, hst, lc, _ = bench()
     ep.capture_slipped = True