lr-shuttle 0.2.2__tar.gz → 0.2.3__tar.gz

{lr_shuttle-0.2.2 → lr_shuttle-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lr-shuttle
-Version: 0.2.2
+Version: 0.2.3
 Summary: CLI and Python client for host-side of json based serial communication with embedded device bridge.
 Author-email: Jonas Estberger <jonas.estberger@lumenradio.com>
 License: MIT

{lr_shuttle-0.2.2 → lr_shuttle-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "lr-shuttle"
-version = "0.2.2"
+version = "0.2.3"
 description = "CLI and Python client for host-side of json based serial communication with embedded device bridge."
 readme = "README.md"
 requires-python = ">=3.11"

{lr_shuttle-0.2.2 → lr_shuttle-0.2.3}/src/lr_shuttle.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lr-shuttle
-Version: 0.2.2
+Version: 0.2.3
 Summary: CLI and Python client for host-side of json based serial communication with embedded device bridge.
 Author-email: Jonas Estberger <jonas.estberger@lumenradio.com>
 License: MIT

{lr_shuttle-0.2.2 → lr_shuttle-0.2.3}/src/shuttle/cli.py

@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import annotations
 
+import ipaddress
+import re
 import string
 import sys
 import time
@@ -107,6 +109,9 @@ for entry in PRODTEST_TX_POWER_LEVELS:
     PRODTEST_TX_POWER_ALIASES[str(entry["value"])] = entry["value"]
 PRODTEST_TX_POWER_CANONICAL = [entry["aliases"][0] for entry in PRODTEST_TX_POWER_LEVELS]
 
+_HOST_PORT_PATTERN = re.compile(r"^[A-Za-z0-9_.-]+:\d+$")
+_IPV6_HOST_PORT_PATTERN = re.compile(r"^\[[0-9A-Fa-f:]+\]:\d+$")
+
 # Backwards-compatible aliases for tests and external callers
 _SerialLogger = SerialLogger
 _SequenceTracker = SequenceTracker
@@ -251,9 +256,24 @@ def _resolve_uart_payload(
     return payload_bytes.hex(), len(payload_bytes)
 
 
+def _normalize_port(port: str) -> str:
+    trimmed = port.strip()
+    if not trimmed:
+        raise typer.BadParameter(
+            "Serial port is required (use --port or SHUTTLE_PORT)"
+        )
+    if "://" in trimmed:
+        return trimmed
+    if trimmed.startswith("/") or trimmed.startswith("\\"):
+        return trimmed
+    if _HOST_PORT_PATTERN.match(trimmed) or _IPV6_HOST_PORT_PATTERN.match(trimmed):
+        return f"socket://{trimmed}"
+    return trimmed
+
+
 def _require_port(port: Optional[str]) -> str:
     if port:
-        return port
+        return _normalize_port(port)
     raise typer.BadParameter("Serial port is required (use --port or SHUTTLE_PORT)")
 
 
@@ -269,6 +289,16 @@ def _parse_int_option(value: str, *, name: str) -> int:
     return parsed
 
 
+def _parse_ipv4(value: Optional[str], *, name: str) -> Optional[str]:
+    if value is None:
+        return None
+    try:
+        ipaddress.IPv4Address(value)
+    except ipaddress.AddressValueError as exc:
+        raise typer.BadParameter(f"{name} must be a valid IPv4 address") from exc
+    return value
+
+
 def _parse_prodtest_mask(value: str) -> bytes:
     try:
         return prodtest.mask_from_hex(value)
@@ -1521,17 +1551,49 @@ def prodtest_ping(
         logger=resources.get("logger"),
         seq_tracker=resources.get("seq_tracker"),
     )
-    if not responses or len(responses) < 2:
+    if not responses:
         console.print("[red]Device returned no response[/]")
         raise typer.Exit(1)
-    rx2 = responses[1].get("rx", "")
-    if rx2 and isinstance(rx2, str):
-        rx_bytes = bytes.fromhex(rx2)
-        if rx_bytes and rx_bytes[0] == 0x2D:  # ord('-')
-            console.print("[green]Ping successful: got '-' response[/]")
-            return
-    console.print(f"[red]Ping failed: expected '-' (0x2D), got: {rx2}[/]")
-    raise typer.Exit(1)
+
+    failed_idx = next(
+        (idx for idx, resp in enumerate(responses) if not resp.get("ok")), None
+    )
+    if failed_idx is not None:
+        phase = "command" if failed_idx == 0 else "payload"
+        _render_spi_response(
+            f"prodtest ping ({phase})",
+            responses[failed_idx],
+            command_label=f"spi.xfer (prodtest {phase})",
+        )
+        raise typer.Exit(1)
+
+    if len(responses) != len(sequence):
+        console.print("[red]Prodtest command halted before completing all SPI phases[/]")
+        raise typer.Exit(1)
+
+    command_response, payload_response = responses
+    _render_spi_response(
+        "prodtest ping (command)",
+        command_response,
+        command_label="spi.xfer (prodtest command)",
+    )
+    _render_spi_response(
+        "prodtest ping (payload)",
+        payload_response,
+        command_label="spi.xfer (prodtest payload)",
+    )
+
+    rx_bytes = _decode_hex_response(
+        payload_response, label="prodtest ping (payload)"
+    )
+    if not rx_bytes or rx_bytes[0] != 0x2D:  # ord('-')
+        console.print(
+            "[red]Ping failed: expected '-' (0x2D), got: "
+            f"{_format_hex(payload_response.get('rx', ''))}[/]"
+        )
+        raise typer.Exit(1)
+
+    console.print("[green]Ping successful: got '-' response[/]")
 
 
 @prodtest_app.command("antenna")
@@ -2328,6 +2390,123 @@ def uart_sub_command(
     _render_payload_response("uart.sub", response)
 
 
+@app.command("wifi-cfg")
+def wifi_cfg_command(
+    ctx: typer.Context,
+    port: Optional[str] = typer.Option(
+        None,
+        "--port",
+        envvar="SHUTTLE_PORT",
+        help="Serial port or host:port (e.g., /dev/ttyUSB0 or 192.168.1.10:5000)",
+    ),
+    baudrate: int = typer.Option(DEFAULT_BAUD, "--baud", help="Serial baud rate"),
+    timeout: float = typer.Option(
+        DEFAULT_TIMEOUT, "--timeout", help="Read timeout in seconds"
+    ),
+    ssid: Optional[str] = typer.Option(
+        None,
+        "--ssid",
+        help="Set the station SSID",
+        show_default=False,
+    ),
+    psk: Optional[str] = typer.Option(
+        None,
+        "--psk",
+        help="Set the WPA/WPA2/WPA3 passphrase",
+        show_default=False,
+    ),
+    dhcp: Optional[bool] = typer.Option(
+        None,
+        "--dhcp/--static",
+        help="Enable DHCP or force static IPv4 addressing",
+    ),
+    ip_addr: Optional[str] = typer.Option(
+        None,
+        "--ip",
+        help="Static IPv4 address (requires --static or other static fields)",
+        show_default=False,
+    ),
+    netmask: Optional[str] = typer.Option(
+        None,
+        "--netmask",
+        help="Static subnet mask (e.g., 255.255.255.0)",
+        show_default=False,
+    ),
+    gateway: Optional[str] = typer.Option(
+        None,
+        "--gateway",
+        help="Static default gateway IPv4 address",
+        show_default=False,
+    ),
+    dns: Optional[str] = typer.Option(
+        None,
+        "--dns",
+        help="Primary DNS server IPv4 address",
+        show_default=False,
+    ),
+    dns_alt: Optional[str] = typer.Option(
+        None,
+        "--dns-alt",
+        help="Secondary DNS server IPv4 address",
+        show_default=False,
+    ),
+):
+    """Query or update Wi-Fi credentials and network settings."""
+
+    resources = _ctx_resources(ctx)
+    wifi_payload: Dict[str, Any] = {}
+    if ssid is not None:
+        wifi_payload["ssid"] = ssid
+    if psk is not None:
+        wifi_payload["psk"] = psk
+    if dhcp is not None:
+        wifi_payload["dhcp"] = dhcp
+
+    network_payload: Dict[str, Any] = {}
+    parsed_ip = _parse_ipv4(ip_addr, name="--ip")
+    parsed_mask = _parse_ipv4(netmask, name="--netmask")
+    parsed_gateway = _parse_ipv4(gateway, name="--gateway")
+    parsed_dns_primary = _parse_ipv4(dns, name="--dns")
+    parsed_dns_secondary = _parse_ipv4(dns_alt, name="--dns-alt")
+
+    if parsed_ip is not None:
+        network_payload["ip"] = parsed_ip
+    if parsed_mask is not None:
+        network_payload["netmask"] = parsed_mask
+    if parsed_gateway is not None:
+        network_payload["gateway"] = parsed_gateway
+
+    dns_entries = [entry for entry in (parsed_dns_primary, parsed_dns_secondary) if entry]
+    if dns_entries:
+        network_payload["dns"] = dns_entries
+
+    if network_payload:
+        if wifi_payload.get("dhcp") is True:
+            raise typer.BadParameter(
+                "Static network options cannot be combined with --dhcp"
+            )
+        wifi_payload.setdefault("dhcp", False)
+        wifi_payload["network"] = network_payload
+
+    resolved_port = _require_port(port)
+    action = "Updating" if wifi_payload else "Querying"
+    with spinner(f"{action} wifi.cfg over {resolved_port}"):
+        try:
+            with NDJSONSerialClient(
+                resolved_port,
+                baudrate=baudrate,
+                timeout=timeout,
+                logger=resources.get("logger"),
+                seq_tracker=resources.get("seq_tracker"),
+            ) as client:
+                response = client.wifi_cfg(wifi_payload if wifi_payload else None)
+        except ShuttleSerialError as exc:
+            console.print(f"[red]{exc}[/]")
+            raise typer.Exit(1) from exc
+
+    _render_payload_response("wifi.cfg", response)
+
+
 @app.command("uart-tx")
 def uart_tx_command(
     ctx: typer.Context,

{lr_shuttle-0.2.2 → lr_shuttle-0.2.3}/src/shuttle/serial_client.py

@@ -228,7 +228,9 @@ class NDJSONSerialClient:
         seq_tracker: Optional[SequenceTracker] = None,
     ):
         try:
-            self._serial = serial.Serial(port=port, baudrate=baudrate, timeout=timeout)
+            self._serial = serial.serial_for_url(
+                url=port, baudrate=baudrate, timeout=timeout
+            )
         except SerialException as exc:  # pragma: no cover - hardware specific
             raise ShuttleSerialError(f"Unable to open {port}: {exc}") from exc
         self._serial.reset_input_buffer()
@@ -345,6 +347,12 @@ class NDJSONSerialClient:
             payload["uart"] = uart
         return self._command("uart.cfg", payload)
 
+    def wifi_cfg(self, wifi: Optional[Dict[str, Any]] = None) -> Dict[str, Any]:
+        payload: Dict[str, Any] = {}
+        if wifi:
+            payload["wifi"] = wifi
+        return self._command("wifi.cfg", payload)
+
     def uart_tx(self, data: str, port: Optional[int] = None) -> Dict[str, Any]:
         payload: Dict[str, Any] = {"data": data}
         if port is not None:

{lr_shuttle-0.2.2 → lr_shuttle-0.2.3}/tests/test_cli.py

@@ -859,6 +859,8 @@ def test_prodtest_ping_success(dummy_serial, recorded_console):
 
     assert result.exit_code == 0
     output = recorded_console.getvalue()
+    assert "spi.xfer (prodtest command)" in output
+    assert "spi.xfer (prodtest payload)" in output
     assert "Ping successful" in output