Address review comments on sigrok driver PR

- Skip empty lines in CSV parser to prevent strict-zip failures
- Use pytest.approx() for float comparison in tests
- Fix stderr pipe deadlock in capture_stream by inheriting stderr
- Fix channel selection to handle device names and empty channel maps
- Handle multi-line VCD value changes and $dumpvars blocks
- Fix source_archive URL to use correct repo name
- Add missing config: wrapper in README exporter YAML example

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: Ambient Code Bot

python/packages/jumpstarter-driver-sigrok/README.md

@@ -18,13 +18,14 @@ pip3 install --extra-index-url https://pkg.jumpstarter.dev/simple/ jumpstarter-d
 export:
   sigrok:
     type: jumpstarter_driver_sigrok.driver.Sigrok
-    driver: fx2lafw                     # sigrok driver (demo, fx2lafw, rigol-ds, etc.)
-    conn: auto                          # optional: USB VID.PID, serial path, or "auto" for auto-detect
-    channels:                           # optional: map device channels to friendly names
-      D0: clk
-      D1: mosi
-      D2: miso
-      D3: cs
+    config:
+      driver: fx2lafw                     # sigrok driver (demo, fx2lafw, rigol-ds, etc.)
+      conn: auto                          # optional: USB VID.PID, serial path, or "auto" for auto-detect
+      channels:                           # optional: map device channels to friendly names
+        D0: clk
+        D1: mosi
+        D2: miso
+        D3: cs
 ```
 
 ### Configuration Parameters

python/packages/jumpstarter-driver-sigrok/jumpstarter_driver_sigrok/csv.py

@@ -70,6 +70,8 @@ def _extract_csv_data_lines(lines: list[str]) -> list[str]:
 
     for _i, line in enumerate(lines):
         line = line.strip()
+        if not line:
+            continue
         # Skip comment lines
         if line.startswith(";"):
             continue

python/packages/jumpstarter-driver-sigrok/jumpstarter_driver_sigrok/driver.py

@@ -108,7 +108,7 @@ async def capture_stream(self, config: CaptureConfig | dict):
         process = await asyncio.create_subprocess_exec(
             *cmd,
             stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
+            stderr=None,
         )
 
         try:
@@ -167,18 +167,19 @@ def _channel_args(self, selected_names: list[str] | None) -> list[str]:
         Returns:
             List of args like ["-C", "D0=vcc,D1=cs,D2=miso"]
         """
+        if selected_names:
+            resolved = [self._resolve_channel(name) for name in selected_names]
+            if self.channels:
+                channel_map = ",".join(f"{dev}={self.channels.get(dev, dev)}" for dev in resolved)
+            else:
+                channel_map = ",".join(resolved)
+            return ["-C", channel_map] if channel_map else []
+
         if not self.channels:
             return []
 
-        # Filter channels if specific names requested
-        if selected_names:
-            selected_lower = {name.lower() for name in selected_names}
-            filtered = {dev: user for dev, user in self.channels.items() if user.lower() in selected_lower}
-        else:
-            filtered = self.channels
-
         # Build channel map: device_name=user_name
-        channel_map = ",".join(f"{dev}={user}" for dev, user in filtered.items())
+        channel_map = ",".join(f"{dev}={user}" for dev, user in self.channels.items())
         return ["-C", channel_map] if channel_map else []
 
     def _config_args(self, cfg: CaptureConfig, *, continuous: bool = False) -> list[str]:
@@ -274,7 +275,10 @@ def _resolve_channel(self, name_or_dn: str) -> str:
         """
         candidate = name_or_dn.strip()
 
-        # If already a device channel name, return as-is
+        if not self.channels:
+            return candidate
+
+        # If already a device channel name (key in channel map), return as-is
         if candidate in self.channels:
             return candidate
 
@@ -283,4 +287,8 @@ def _resolve_channel(self, name_or_dn: str) -> str:
             if user_name.lower() == candidate.lower():
                 return dev_name
 
+        # Accept device-style names (e.g., "D0", "A1") even if not in channel map
+        if candidate[:1].isalpha() and candidate[1:].isdigit():
+            return candidate
+
         raise ValueError(f"Channel '{name_or_dn}' not found in channel map {self.channels}")

python/packages/jumpstarter-driver-sigrok/jumpstarter_driver_sigrok/driver_test.py

@@ -302,7 +302,7 @@ def test_decode_csv_format(demo_client):
         assert isinstance(sample.values, dict)
 
         # Verify timing progresses (1/100kHz = 0.00001s per sample)
-        assert sample.time == sample.sample * 0.00001
+        assert sample.time == pytest.approx(sample.sample * 0.00001, rel=1e-6, abs=1e-12)
 
         # Verify values are present
         assert len(sample.values) > 0

python/packages/jumpstarter-driver-sigrok/jumpstarter_driver_sigrok/vcd.py

@@ -44,21 +44,52 @@ def parse_vcd(data: bytes, sample_rate: str) -> Iterator[dict]:
         if line == "$enddefinitions $end":
             break
 
-    # Parse and yield value changes one by one
+    # Parse value changes across timestamp blocks (supports multi-line changes)
     sample_idx = 0
+    current_time_s: float | None = None
+    current_values: dict[str, int | float] = {}
 
     for line in lines:
         line = line.strip()
-        if not line or line.startswith("$"):
+        if not line:
+            continue
+        if line.startswith("$"):
+            # Handle $dumpvars block: parse value changes until $end
+            if line.startswith("$dumpvars"):
+                if current_time_s is None:
+                    current_time_s = 0.0
+                # If $dumpvars and $end are on the same line, skip
+                if "$end" not in line or line == "$dumpvars":
+                    continue
             continue
 
-        # Timestamp line (e.g., "#100 1! 0" 1#")
         if line.startswith("#"):
-            sample_data = _parse_vcd_timestamp_line(line, timescale_multiplier, channel_map)
-            if sample_data is not None:
-                sample_data["sample"] = sample_idx
-                yield sample_data
+            # Flush previous timestamp block
+            if current_time_s is not None and current_values:
+                yield {"sample": sample_idx, "time": current_time_s, "values": current_values}
                 sample_idx += 1
+                current_values = {}
+
+            parts = line.split(maxsplit=1)
+            time_str = parts[0][1:]
+            if time_str:
+                current_time_s = int(time_str) * timescale_multiplier
+            else:
+                current_time_s = 0.0
+
+            # Inline values on the same line (if present)
+            if len(parts) > 1:
+                _parse_vcd_value_changes(parts[1], channel_map, current_values)
+            continue
+
+        # Value change line (may appear after # or inside $dumpvars)
+        if current_time_s is None:
+            current_time_s = 0.0
+        _parse_vcd_value_changes(line, channel_map, current_values)
+
+    # Flush final block
+    if current_time_s is not None and current_values:
+        yield {"sample": sample_idx, "time": current_time_s, "values": current_values}
 
 
 def _parse_timescale(line: str) -> float:

python/packages/jumpstarter-driver-sigrok/pyproject.toml

@@ -18,7 +18,7 @@ raw-options = { 'root' = '../../../'}
 
 [tool.hatch.metadata.hooks.vcs.urls]
 Homepage = "https://jumpstarter.dev"
-source_archive = "https://github.com/jumpstarter-dev/repo/archive/{commit_hash}.zip"
+source_archive = "https://github.com/jumpstarter-dev/jumpstarter/archive/{commit_hash}.zip"
 
 [tool.pytest.ini_options]
 addopts = "--cov --cov-report=html --cov-report=xml"