axiometa-cli 1.0.2__tar.gz → 1.0.4__tar.gz

{axiometa_cli-1.0.2 → axiometa_cli-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: axiometa-cli
-Version: 1.0.2
+Version: 1.0.4
 Summary: Prompt to hardware, in your terminal: detect a board, chat to build, deploy, watch serial.
 Author-email: Axiometa <dr.dumcius@gmail.com>
 Project-URL: Homepage, https://axiometa.io

{axiometa_cli-1.0.2 → axiometa_cli-1.0.4}/axiometa_cli/__init__.py

@@ -16,4 +16,12 @@ Three ideas the CLI implements, all grounded in the backend registries:
   - The serial CHANNEL is one contract; only its TRANSPORT changes: raw stdout in a terminal, or a
     127.0.0.1 + token-gated localhost page (opened locally, or reached over `ssh -L`) for a surface.
 """
-__version__ = "1.0.0"
+# Read the real installed version from package metadata so `--version` never goes stale again.
+try:
+    from importlib.metadata import version as _pkg_version, PackageNotFoundError
+    try:
+        __version__ = _pkg_version("axiometa-cli")
+    except PackageNotFoundError:
+        __version__ = "0.0.0+dev"
+except Exception:
+    __version__ = "0.0.0+dev"

{axiometa_cli-1.0.2 → axiometa_cli-1.0.4}/axiometa_cli/core.py

@@ -15,6 +15,7 @@ import os
 import shutil
 import subprocess
 import sys
+import time
 from dataclasses import dataclass, field
 from pathlib import Path
 
@@ -233,15 +234,37 @@ _NO_MP_MSG = ("the board is not responding to mpremote — it has no MicroPython
               "Lay MicroPython down over SWD first:  axiometa flash --firmware <micropython.uf2>")
 
 
+def _reset_via_run(swd: dict | None) -> bool:
+    """Pulse the RP2040 RUN pin (a Pi GPIO) to drop the board into a FRESH REPL before mpremote talks
+    to it. The REPL is single-owner: a program from a prior `run` (or a wedged loop) holds the port, so
+    the next deploy can't enter raw REPL and surfaces as "not responding to mpremote". A hardware reset
+    over RUN clears that every time — it is what a manual power-cycle did by hand. Pi-only (`pinctrl`),
+    best-effort and silent where RUN isn't wired or pinctrl is absent (USB boards reset over USB instead,
+    so they never reach here needing it)."""
+    if not swd:
+        return False
+    run_gpio = swd.get("run_gpio")
+    if not run_gpio or not shutil.which("pinctrl"):
+        return False
+    if not _run(["pinctrl", "set", str(run_gpio), "op", "dl"], timeout=5).ok:
+        return False
+    time.sleep(0.3)
+    _run(["pinctrl", "set", str(run_gpio), "op", "dh"], timeout=5)
+    time.sleep(1.2)   # let MicroPython boot through _boot.py to a reachable REPL
+    return True
+
+
 def _mpremote_reachable(target: list) -> bool:
     """Quick check that a MicroPython REPL is actually there, so a bare board gives a clear message
     instead of a cryptic connect error."""
     return _run(["mpremote", *target, "eval", "1"], timeout=10).ok
 
 
-def mpremote_run(program: Path, port: str | None, companions: list, on_line=None) -> DeployResult:
+def mpremote_run(program: Path, port: str | None, companions: list, swd: dict | None = None,
+                 on_line=None) -> DeployResult:
     """Ephemeral test: copy to RAM and run live. Gone on reset. The fast generate-run-read-fix loop."""
     target = ["connect", port] if port else []
+    _reset_via_run(swd)   # fresh REPL first — a prior `run` holds the single-owner port otherwise
     if not _mpremote_reachable(target):
         return DeployResult(False, _NO_MP_MSG, [])
     for cmp in companions:
@@ -249,9 +272,11 @@ def mpremote_run(program: Path, port: str | None, companions: list, on_line=None
     return _run(["mpremote", *target, "run", str(program)], on_line=on_line)
 
 
-def mpremote_install(program: Path, port: str | None, companions: list, on_line=None) -> DeployResult:
+def mpremote_install(program: Path, port: str | None, companions: list, swd: dict | None = None,
+                     on_line=None) -> DeployResult:
     """Persist: copy companions + main.py to flash, soft-reset so it auto-runs on boot."""
     target = ["connect", port] if port else []
+    _reset_via_run(swd)   # fresh REPL first (same single-owner reason as mpremote_run)
     if not _mpremote_reachable(target):
         return DeployResult(False, _NO_MP_MSG, [])
     for cmp in companions:
@@ -385,9 +410,10 @@ def deploy(board: dict, sub: dict, project_dir: Path, verb: str, port: str | Non
         return DeployResult(False, f"no {sub['device_program']} in {project_dir} — generate it first.", [])
     if verb in ("run", "install"):
         companions = _companions(board, sub, project_dir)
+        swd = (sub.get("host_interface") or {}).get("swd")
         if verb == "run":
-            return mpremote_run(program, port, companions, on_line)
-        return mpremote_install(program, port, companions, on_line)
+            return mpremote_run(program, port, companions, swd, on_line)
+        return mpremote_install(program, port, companions, swd, on_line)
     if verb == "deploy":
         if not sub.get("fqbn"):
             return DeployResult(False, "this substrate has no fqbn; use run/install via mpremote.", [])

{axiometa_cli-1.0.2 → axiometa_cli-1.0.4}/axiometa_cli/flash.py

@@ -57,20 +57,26 @@ def uf2_to_bin(uf2_path: Path) -> tuple[Path, int]:
 
 
 def _interface_cfg(swd: dict) -> str:
-    """An OpenOCD interface config snippet for the SWD wiring (env-overridable)."""
+    """An OpenOCD interface config snippet for the SWD wiring (env-overridable).
+
+    RUN (GPIO23) is deliberately NOT given to OpenOCD as `srst`. The RP2040's SW-DP is a multidrop
+    port and RUN resets the debug port itself: asserting srst during `program ... reset` drops the DAP
+    mid-flash and floods "Too long SWD WAIT" until OpenOCD aborts (cores examine fine, then the reset
+    step fails). The program flow uses the Cortex-M software reset (SYSRESETREQ) instead, which leaves
+    the DAP alive. RUN stays wired for the runtime mpremote reset (see module docstring) — it is just
+    wrong to drive it as srst while flashing this chip.
+    """
     driver = os.environ.get("AXIOMETA_OPENOCD_DRIVER", "bcm2835gpio")
     swclk = swd.get("swclk_gpio", 25)
     swdio = swd.get("swdio_gpio", 24)
-    srst = swd.get("run_gpio", 23)
     speed = os.environ.get("AXIOMETA_OPENOCD_SPEED", "1000")
     lines = [
         f"adapter driver {driver}",
         f"adapter gpio swclk {swclk}",
         f"adapter gpio swdio {swdio}",
+        "transport select swd",
+        f"adapter speed {speed}",
     ]
-    if srst:
-        lines += [f"adapter gpio srst {srst}", "reset_config srst_only srst_nogate"]
-    lines += ["transport select swd", f"adapter speed {speed}"]
     return "\n".join(lines) + "\n"
 
 

{axiometa_cli-1.0.2 → axiometa_cli-1.0.4}/axiometa_cli/interactive.py

@@ -392,12 +392,18 @@ def run(args) -> None:
         if not text:
             continue
         low = text.lower()
-        if low in ("/exit", "/quit", "exit", "quit"):
+        # Commands work WITH or WITHOUT the leading slash, and tolerate a trailing "?": a lone word like
+        # "run" only ever means "deploy it", never a build prompt. `cmd` is the bare single token (empty
+        # if the user typed a real sentence), so "run faster" still goes to Axie as a build request.
+        cmd = low.lstrip("/").rstrip("? ").strip()
+        if " " in cmd:
+            cmd = ""
+        if cmd in ("exit", "quit"):
             break
-        if low == "/help":
+        if cmd == "help":
             ui.hint("describe a build in plain words, or: /flash /deploy /run /install /host /monitor /serve /board /exit")
             continue
-        if low.startswith("/flash"):
+        if cmd == "flash" or low.startswith("/flash"):
             parts = text.split()
             fw = Path(parts[1]).expanduser() if len(parts) > 1 else None
             res = core.flash_firmware(board, sub, fw, on_line=lambda ln: print(ui.c("  " + ln, "grey")))
@@ -405,20 +411,19 @@ def run(args) -> None:
             if not res.ok and fw is None:
                 ui.hint("usage: /flash <path-to-micropython.uf2>")
             continue
-        if low in ("/deploy", "/run", "/install"):
-            verb = low[1:]
-            res = core.deploy(board, sub, pdir, verb if verb in core.verbs_for(sub) else verb, port,
+        if cmd in ("deploy", "run", "install"):
+            res = core.deploy(board, sub, pdir, cmd, port,
                               on_line=lambda ln: print(ui.c("  " + ln, "grey")))
             (ui.ok if res.ok else ui.err)(res.detail.splitlines()[0] if res.ok and res.detail else res.detail)
             continue
-        if low == "/host":
+        if cmd == "host":
             run_host(pdir); continue
-        if low == "/monitor":
+        if cmd == "monitor":
             monitor(port); continue
-        if low == "/serve":
+        if cmd == "serve":
             from . import serve as serve_mod
             serve_mod.serve(pdir, port, over_ssh=profile["over_ssh"]); continue
-        if low == "/board":
+        if cmd == "board":
             board, sub, port = _pick_target(pdir, boards, devices)
             session.board_id = board["id"]
             ui.ok(f"target: {board['name']} · {sub['label']}"); continue

{axiometa_cli-1.0.2 → axiometa_cli-1.0.4}/axiometa_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: axiometa-cli
-Version: 1.0.2
+Version: 1.0.4
 Summary: Prompt to hardware, in your terminal: detect a board, chat to build, deploy, watch serial.
 Author-email: Axiometa <dr.dumcius@gmail.com>
 Project-URL: Homepage, https://axiometa.io

{axiometa_cli-1.0.2 → axiometa_cli-1.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "axiometa-cli"
-version = "1.0.2"
+version = "1.0.4"
 description = "Prompt to hardware, in your terminal: detect a board, chat to build, deploy, watch serial."
 readme = "README.md"
 requires-python = ">=3.9"