oep-client-python 0.0.15__py3-none-any.whl → 0.0.17__py3-none-any.whl

oep_client/__init__.py

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

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.15.dist-info → oep_client_python-0.0.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: oep-client-python
-Version: 0.0.15
+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.15.dist-info → oep_client_python-0.0.17.dist-info}/RECORD

@@ -1,4 +1,4 @@
-oep_client/__init__.py,sha256=zvm0p-O0Tj_srfItEl2MxajgC1E-8S4OVkof3AZxwSk,164
+oep_client/__init__.py,sha256=eyvvNunbMdAbPy2V8fuoA6ihjB1jAMnjjlda5qwBhkA,164
 oep_client/__main__.py,sha256=qtVGdpAHULBtLY2SedabJf-uwDZZhMf_YmrbqRzM57U,14669
 oep_client/arm.py,sha256=JLyUhLSPcmsk73schZcaJYoOKuHzrvnU8kPmfrEvVuo,12331
 oep_client/capture.py,sha256=Nmx9Oi9YzS_0HfeM3pDcGvqfHINSrifFqwNj9D7-D-U,25851
@@ -10,7 +10,7 @@ oep_client/console.py,sha256=YYcuc9Qxe3kihla8wynYbDaLVr7wBLEvswrM-cMK3Tk,6859
 oep_client/core.py,sha256=Cyyaknjipkg6tS76dZe5GMqjmOoQjlfeP0WFtMHkJNs,10403
 oep_client/decode.py,sha256=M-bRARrA2qGZLoJn0BdXeTb4WjL_2Hb2nk_g1IGXIw4,2382
 oep_client/dump.py,sha256=GAnmu2abuDmGmbWcbbEfC3EUuPp5Hady9vQVNcQ-724,6743
-oep_client/endpoint.py,sha256=aa9znMaedjEnMDNcGsV-4gxTZJSd6IxNyPpcJM2PEzk,87244
+oep_client/endpoint.py,sha256=km-oC4patoXIh9YVjJhiEzK8AhzkhAA67YYpgK-h7ko,88117
 oep_client/esp32_targets.py,sha256=b8tNH-nb2KC-XgNfWg5l3TO0cyhZOF-gJajaVxNVSGQ,4988
 oep_client/fake.py,sha256=18zEHdvJzgEEqDZ2Dk2hcE_bct2UKGegc38FobmiYpM,18111
 oep_client/fake_capture.py,sha256=6BadaybnZ0jRDfxjnkLXttw65rkoPgsIY5FvAWKxMg8,22812
@@ -30,8 +30,8 @@ oep_client/rp2350.py,sha256=7OMyj270k3AY1e3-ljicPwOjf9jOlokbT6QNkA0b0yY,4227
 oep_client/target.py,sha256=R8BvYfFfYNhZF0MysJkNb8b69YgBlmeGXNX8ReZIe5k,1068
 oep_client/uiapduino.py,sha256=IEPG3LbZPksi8g3wmAf6T0CRWSfYKW1_qrH_GBVQdxY,6090
 oep_client/usb_stream.py,sha256=VJMCxsOlQCk005FcS92pqTh33fRSFBizoL__L0VbUMA,10242
-oep_client_python-0.0.15.dist-info/METADATA,sha256=VCoBb6lru7BAlrA8zkzlVKZ20kgjuy8gSSbKDjJ70-o,8590
-oep_client_python-0.0.15.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-oep_client_python-0.0.15.dist-info/entry_points.txt,sha256=h6_8QX89Ww1ogALEGG5g4kspT3IOV6O51lwKqf5BWco,49
-oep_client_python-0.0.15.dist-info/licenses/LICENSE,sha256=ntlalztb3L1OaNAxmQdHlubu5fVhjMc9oRZi3PeQhXg,1076
-oep_client_python-0.0.15.dist-info/RECORD,,
+oep_client_python-0.0.17.dist-info/METADATA,sha256=j1bbDsxnhlR7Lr02Q6hErSsfmMVz7XwQUx1UMXC2_Lw,8590
+oep_client_python-0.0.17.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+oep_client_python-0.0.17.dist-info/entry_points.txt,sha256=h6_8QX89Ww1ogALEGG5g4kspT3IOV6O51lwKqf5BWco,49
+oep_client_python-0.0.17.dist-info/licenses/LICENSE,sha256=ntlalztb3L1OaNAxmQdHlubu5fVhjMc9oRZi3PeQhXg,1076
+oep_client_python-0.0.17.dist-info/RECORD,,