oep-client-python 0.0.6__tar.gz → 0.0.7__tar.gz

{oep_client_python-0.0.6 → oep_client_python-0.0.7}/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## 0.0.7
+- (EN) `oep dump` names the wires' reset role (role 3) and no longer lists riscv-dm's clobbers (gone: the probe puts the registers back itself, oep-if-debug §4.5).
+- (JA) `oep dump` は wire の reset の役（role 3）を名前で出し、riscv-dm の clobbers を出さなくなった（無くなった: probe が自分でレジスタを戻す、oep-if-debug §4.5）。
+- (EN) `LogicCapture.to_sr` writes up to 16 channels (sigrok unitsize 2 above 8); it stopped at 8.
+- (JA) `LogicCapture.to_sr` は 16 ch まで書く（8 ch を超えると sigrok の unitsize 2）。前は 8 ch まで。
+
 ## 0.0.6
 - (EN) No default reset line (oep-if-debug §3): `Wire.attach_under_reset(channel, ...)` needs its channel, and `Wire.reset_channels()` reads the ones the probe allows (describe role_channels, role reset). The fake takes only those, and not one a plan holds.
 - (JA) 既定の reset 線は無くなった（oep-if-debug §3）: `Wire.attach_under_reset(channel, ...)` は channel が必須。probe が許す channel は `Wire.reset_channels()` で読む（describe の role_channels の role reset）。偽の probe はそれだけを受け、plan が持つ channel は断る。

{oep_client_python-0.0.6 → oep_client_python-0.0.7}/PKG-INFO

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

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

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.0.6"
+__version__ = "0.0.7"

{oep_client_python-0.0.6 → oep_client_python-0.0.7}/src/oep_client/capture.py

@@ -347,18 +347,20 @@ class LogicCapture(Interface):
         return [(data[(i * c.width + bit0) >> 3] >> ((i * c.width + bit0) & 7)) & 1 for i in range(n)]
 
     def to_sr(self, path: str, data: bytes, samples: int, names: list[str] | None = None) -> None:
-        """A sigrok session file: one byte per sample, bit k = channel k (so up to 8 channels here)."""
+        """A sigrok session file: bit k of each sample = channel k, one byte per sample up to 8 channels, two (little
+        endian, sigrok's unitsize 2) up to 16."""
         c = self.config
         n_ch = len(c.positions)
-        if n_ch > 8:
-            raise ValueError("to_sr writes one byte per sample; more than 8 channels need unitsize 2")
+        unit = 1 if n_ch <= 8 else 2
+        if n_ch > 16:
+            raise ValueError("to_sr writes up to 16 channels")
         names = names or [f"D{k}" for k in range(n_ch)]
         chans = [self.channel(data, k, samples) for k in range(n_ch)]
-        out = bytes(sum(chans[k][i] << k for k in range(n_ch)) for i in range(samples))
+        out = b"".join(sum(chans[k][i] << k for k in range(n_ch)).to_bytes(unit, "little") for i in range(samples))
         rate = c.rate.numerator // c.rate.denominator
         meta = ["[global]", "sigrok version=0.5.2", "", "[device 1]", "capturefile=logic-1",
                 f"total probes={n_ch}", f"samplerate={rate} Hz", "total analog=0"]
-        meta += [f"probe{k + 1}={nm}" for k, nm in enumerate(names)] + ["unitsize=1", ""]
+        meta += [f"probe{k + 1}={nm}" for k, nm in enumerate(names)] + [f"unitsize={unit}", ""]
         with zipfile.ZipFile(path, "w") as z:
             z.writestr("version", "2")
             z.writestr("metadata", "\n".join(meta))

{oep_client_python-0.0.6 → oep_client_python-0.0.7}/src/oep_client/interfaces.py

@@ -71,15 +71,14 @@ KNOWN: dict[str, Known] = {
               0x46: ("label", _label), 0x47: ("resets on open", lambda v: "yes"),
               0x49: ("transport", _transport), 0x4A: ("OEP VID:PID", lambda v: "yes" if v[:1] == b"\x01" else "no")}),
     "oep.wire.rvswd": Known("scan, attach, detach over RVSWD (attach returns a connection)",
-                            roles={1: "SWDIO", 2: "SWCLK"}, tags={0x40: ("max connections", lambda v: str(v[0]))}),
+                            roles={1: "SWDIO", 2: "SWCLK", 3: "reset"}, tags={0x40: ("max connections", lambda v: str(v[0]))}),
     "oep.wire.swio": Known("scan, attach, detach over SWIO, one wire (attach returns a connection)",
-                           roles={1: "SWIO"}, tags={0x40: ("max connections", lambda v: str(v[0]))}),
+                           roles={1: "SWIO", 3: "reset"}, tags={0x40: ("max connections", lambda v: str(v[0]))}),
     "oep.wire.swd": Known("scan, attach, detach over ARM SWD", roles={1: "SWDIO", 2: "SWCLK"},
                           tags={0x40: ("max connections", lambda v: str(v[0]))}),
     "oep.target.riscv-dm": Known(
         "RISC-V Debug Module over DMI: step lists, block read/write, run until halt, halt/resume",
-        features={0: "block read/write", 1: "run until halt", 2: "reset", 3: "step"},
-        tags={0x40: ("clobbers", lambda v: ", ".join(f"0x{r:04x}" for r in struct.unpack(f"<{len(v) // 2}H", v)))}),
+        features={0: "block read/write", 1: "run until halt", 2: "reset", 3: "step"}),
     "oep.target.arm-adi": Known("ARM Debug Interface: DP/AP transfer lists, block transfers"),
     "oep.target.console": Known(
         "console streams on a debug connection (position-addressed, marks)",

{oep_client_python-0.0.6 → oep_client_python-0.0.7}/src/oep_client/registry.py

@@ -2,7 +2,7 @@
 
 from types import SimpleNamespace as _NS
 
-REGISTRY_HASH = "049bd156b4775990"
+REGISTRY_HASH = "dd6d527421bb6206"
 SCHEMA = 1
 PROTOCOL_REVISION = 1
 CONFIRM_REQUEST_MAGIC = 'OEP?'
@@ -34,7 +34,7 @@ WIRE_SWD = _NS(name="oep.wire.swd", revision=1, op={"scan": 0x01, "attach": 0x02
     closed_tail={}, tlv={"describe": {"max_connections": 0x40}, "detach": {"force": 0x01}, "attach": {"max_speed": 0x01, "targetsel": 0x02, "pins": 0x03}}, event={}, enum={"connection_users": {"host_session": 0x01, "slot": 0x02}, "pin_role": {"swdio": 0x01, "swclk": 0x02}}, own={})
 INTERFACES["oep.wire.swd"] = WIRE_SWD
 TARGET_RISCV_DM = _NS(name="oep.target.riscv-dm", revision=1, op={"dmi": 0x01, "halt": 0x02, "resume": 0x03, "reset": 0x04, "read_block": 0x05, "write_block": 0x06, "run": 0x07, "step": 0x08}, lock_free={},
-    closed_tail={}, tlv={"describe": {"clobbers": 0x40}, "reset": {"method": 0x01}}, event={}, enum={"dmi_step": {"write": 0x01, "read": 0x02, "poll_reads": 0x03, "wait_us": 0x04, "poll_us": 0x05}, "reset_mode": {"run": 0x00, "run_verified": 0x01, "halt_at_reset": 0x02}, "reset_method": {"probe_default": 0x00, "ndmreset": 0x01, "system_reset": 0x02}}, own={})
+    closed_tail={}, tlv={"describe": {}, "reset": {"method": 0x01}}, event={}, enum={"dmi_step": {"write": 0x01, "read": 0x02, "poll_reads": 0x03, "wait_us": 0x04, "poll_us": 0x05}, "reset_mode": {"run": 0x00, "run_verified": 0x01, "halt_at_reset": 0x02}, "reset_method": {"probe_default": 0x00, "ndmreset": 0x01, "system_reset": 0x02}}, own={})
 INTERFACES["oep.target.riscv-dm"] = TARGET_RISCV_DM
 TARGET_ARM_ADI = _NS(name="oep.target.arm-adi", revision=1, op={"transfer": 0x01, "read_block": 0x02, "write_block": 0x03}, lock_free={},
     closed_tail={}, tlv={}, event={}, enum={}, own={})

{oep_client_python-0.0.6 → oep_client_python-0.0.7}/tests/test_capture.py

@@ -102,3 +102,16 @@ def test_read_spans_frames_without_the_header_leaking_into_the_data():
     hst._revisions[21] = 1
     lc = c.LogicCapture(hst)
     assert lc.read(100, 2500) == stream[100:2600]
+
+
+def test_sigrok_file_takes_sixteen_channels_in_two_bytes(tmp_path):
+    import zipfile
+    lc = logic(16, list(range(16)))
+    lc.config.rate = Fraction(20_000_000)
+    samples = [0x8001, 0x0102]
+    path = tmp_path / "x.sr"
+    lc.to_sr(str(path), b"".join(v.to_bytes(2, "little") for v in samples), 2)
+    with zipfile.ZipFile(path) as z:
+        meta = z.read("metadata").decode()
+        assert "unitsize=2" in meta and "total probes=16" in meta and "samplerate=20000000 Hz" in meta
+        assert z.read("logic-1-1") == bytes([0x01, 0x80, 0x02, 0x01])