oep-client-python 0.0.16__tar.gz → 0.0.17__tar.gz

{oep_client_python-0.0.16 → oep_client_python-0.0.17}/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 0.0.17
+- (EN) The fake's analog shares its pins with nothing (oep-if-capture §1.2): a plan that puts a logic capture, a fixture or a wire on an analog channel, or the analog on a pin another fn / a slot / a connection uses, is rejected unavailable, whichever comes second. A logic capture still listens on anything else.
+- (JA) 偽の probe のアナログは、ピンを誰とも共有しない（oep-if-capture §1.2）。アナログのチャネルにロジックのキャプチャ、fixture、線を載せる plan も、ほかの fn・スロット・接続が使うピンにアナログを載せる plan も、後から来た方を rejected unavailable で断る。ロジックのキャプチャは、それ以外ではどのピンでも聞ける。
+
 ## 0.0.16
 - (EN) No user-facing changes recorded.
 - (JA) ユーザー向け変更の記録はありません。

{oep_client_python-0.0.16 → oep_client_python-0.0.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: oep-client-python
-Version: 0.0.16
+Version: 0.0.17
 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.16 → oep_client_python-0.0.17}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "oep-client-python"
-version = "0.0.16"
+version = "0.0.17"
 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.16 → oep_client_python-0.0.17}/src/oep_client/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.0.16"
+__version__ = "0.0.17"

{oep_client_python-0.0.16 → oep_client_python-0.0.17}/src/oep_client/endpoint.py

@@ -518,7 +518,7 @@ class Endpoint:
     def _held(self, fn: int | None = None, pair: tuple[int, int] | None = None) -> set[int]:
         """Channels something holds (core §8.1): the plan, the slots' pairs, the live connections' pairs - except
         wire `fn`'s own connection on `pair` (attaching there again, or scanning through it)."""
-        held = {a[2] for a in self.plan if a[0] not in self.captures}   # a capture only listens
+        held = {a[2] for a in self.plan if not self._listens(a[0])}   # a logic capture only listens
         held |= {p for s in self.slots.values() for p in s.pair if p != 0xFFFF and not (s.wire_fn == fn and s.pair == pair)}
         held |= {p for c in self.conns.values() for p in c.pair if p != 0xFFFF and not (c.fn == fn and c.pair == pair)}
         return held
@@ -799,14 +799,27 @@ class Endpoint:
             return m.COMPLETED, m.SUCCESS, b""
         return m.REJECTED, m.UNKNOWN_OPERATION, b""
 
+    def _listens(self, fn: int) -> bool:
+        """A logic capture only listens: it shares pins with anything (core §8.1). The analog does not: its pads go to
+        their analog function, cutting their digital input and output (oep-if-capture §1.2), as on this library's ESP32s."""
+        return fn in self.captures and not self.captures[fn].analog
+
     def _check_plan(self, got: list[tuple[int, int, int]]) -> None:
         """plan_apply's all-or-nothing check: the roles each fn has, and no pin another fn (or a slot) holds."""
         named = {fn for fn, _, _ in got}
-        # a capture only listens: it shares pins with anything, and nothing is kept from a pin by it (core §8.1)
-        kept = {a for a in self.plan if a[0] not in named and a[0] not in self.captures}
+        others = {a for a in self.plan if a[0] not in named}
+        kept = {a for a in others if not self._listens(a[0])}
         slot_pins = {p for s in self.slots.values() for p in s.pair if p != 0xFFFF}
         slot_pins |= {p for c in self.conns.values() for p in c.pair if p != 0xFFFF}   # a live connection's pins too
+        analog = {fn for fn, cap in self.captures.items() if cap.analog}
         for fn, role, ch in got:
+            beside = [f for f, _, c in got if c == ch and f != fn] + [a[0] for a in others if a[2] == ch]
+            if fn in analog:   # the analog shares its pin with nothing: another fn's plan, a slot, a connection
+                if role not in self._declared_roles(fn, ch) or beside or ch in slot_pins:
+                    raise Reject(m.UNAVAILABLE)
+                continue
+            if any(f in analog for f in beside):   # nor may anything come onto an analog pin
+                raise Reject(m.UNAVAILABLE)
             if fn in self.captures:
                 if role not in self._declared_roles(fn, ch):
                     raise Reject(m.UNAVAILABLE)

{oep_client_python-0.0.16 → oep_client_python-0.0.17}/tests/test_fake_capture.py

@@ -160,6 +160,24 @@ def test_a_capture_listens_on_pins_other_interfaces_hold():
         core.plan_apply(hst, [(gpio, 1, 12)])                       # the UART still holds it against drivers
 
 
+
+def test_an_analog_pin_is_shared_with_nothing():
+    """The analog cuts its pads' digital input and output (oep-if-capture §1.2): refused whichever comes second."""
+    ep, hst, lc, _ = bench()
+    an = c.AnalogCapture(hst)
+    gpio = core.find(hst, "oep.fixture.gpio")
+    core.plan_apply(hst, [(an.fn, 0, 16)])
+    for other in ([(lc.fn, 0, 16)], [(gpio, 1, 16)]):             # logic that would read 0, a driver that would not drive
+        with pytest.raises(h.Rejected):
+            core.plan_apply(hst, other)
+    core.plan_apply(hst, [(lc.fn, 0, 17)])                          # another pad: fine
+    core.plan_release(hst, [an.fn])
+    core.plan_apply(hst, [(lc.fn, 0, 16)])
+    with pytest.raises(h.Rejected):
+        core.plan_apply(hst, [(an.fn, 0, 16)])                      # the analog after the logic: refused too
+    with pytest.raises(h.Rejected):
+        core.plan_apply(hst, [(an.fn, 0, 18), (gpio, 1, 18)])      # in one request as well
+
 def test_fake_serve_streams_over_tcp_to_the_client():
     """The whole path wireskein takes: open_host, take, plan, configure, subscribe, start, stream, stop, finish."""
     import subprocess