pureboot v8: one-wire on every backend
HALF_DUPLEX deploys a shared line per backend. The hardware USART takes the library's .half_duplex turn-around — RXD and TXD tied off-chip, each reply byte held to transmit-complete before the line can be released (m8 404 B, m328P 440, 1284P 460; the window poll runs through the outlined release-line call at 18 or 22 cycles a poll, measured off the built loops and held per chip by pureboot.window.halfduplex). The software and autobaud links fold onto the RX pin — RX == TX spells the same — and cost nothing: the frame's direction wrap is what the dropped second-pin init paid, and the worst image in the space is unchanged at the 1284s' 502 of 512, now with its one-wire twin proven equal across the exhaustive matrix. The host gains --one-wire, the echo discard a shared line requires: the adapter's echo is matched byte for byte and a reply interleaving a blind write — a loader already in session re-prompts inside the knock — is held for the reader. The device runner models the shared line by direction (drives only while the firmware's DDR reads input, decodes only while the firmware owns it, supplies the host-side echo), extends the USART pin-ownership model to RXEN's hold on RXD, and starts the pty USART from the datasheet's zeroed UCSR#B: simavr's TXEN-set reset plus its clear-UDRE-on-TXEN-drop otherwise wedges the first transmitter after a receiver-only program, which the half-duplex window gate caught as a banner that never came. v7 is tagged at its era's last commit; v8 changes nothing on the wire. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -26,15 +26,16 @@ else:
|
||||
import termios
|
||||
|
||||
PROMPT = b"+"
|
||||
VERSION = 8 # this tool's own version — free to drift from a loader's
|
||||
VERSION = 9 # this tool's own version — free to drift from a loader's
|
||||
# The loader versions this tool can drive. A pureboot version implies its wire
|
||||
# protocol, which carries no number of its own, so this window is where that
|
||||
# map lives: the tool keeps a decoder for every generation in it (1–4 speak
|
||||
# the per-memory commands, 5 the unified pair; 6 marks the OSCCAL-carrying
|
||||
# builds and changes nothing on the wire), and a version it has no decoder
|
||||
# for moves the floor.
|
||||
# builds and changes nothing on the wire; 8 the one-wire deployments, whose
|
||||
# only host-side trace is the --one-wire echo discard), and a version it has
|
||||
# no decoder for moves the floor.
|
||||
OLDEST_LOADER = 1
|
||||
NEWEST_LOADER = 7
|
||||
NEWEST_LOADER = 8
|
||||
SLOT = 512 # the loader slot, on every chip
|
||||
RETRIES = 3 # rewrites of a page that reads back wrong, before the run stops
|
||||
|
||||
@@ -45,7 +46,10 @@ RETRIES = 3 # rewrites of a page that reads back wrong, before the run stops
|
||||
# 6 marks the builds that may carry a baked OSCCAL trim, nothing on the wire;
|
||||
# 7 gives 'J' a selector byte (older loaders take the bare address — jump()
|
||||
# sends each form to the version that speaks it) and re-homes the autobaud
|
||||
# unit into the GPIOR pair where the chip has one.
|
||||
# unit into the GPIOR pair where the chip has one; 8 marks the builds whose
|
||||
# deployment may be one-wire (hardware half-duplex, or a software link folded
|
||||
# onto one pin) — nothing on the wire either, but a shared line makes the
|
||||
# host read its own bytes back, which is what --one-wire consumes.
|
||||
UNIFIED_LOADER = 5
|
||||
SP_FLASH, SP_EEPROM, SP_RAM, SP_FUSE, SP_SPM = 0, 1, 2, 3, 4
|
||||
|
||||
@@ -433,6 +437,61 @@ if os.name == "nt":
|
||||
Port = WindowsPort if os.name == "nt" else PosixPort
|
||||
|
||||
|
||||
class OneWirePort:
|
||||
"""The host side of a shared line (--one-wire): an FTDI-style adapter on
|
||||
a one-wire link reads back every byte it transmits — its RX is tied to
|
||||
its own TX through the line. Consume that echo at each write and verify
|
||||
it, which doubles as a wiring check: an echo that never comes is an RX
|
||||
not on the line, and is reported as itself instead of decoding as a
|
||||
device reply.
|
||||
|
||||
The device's reply may interleave with the echo of a multi-byte write —
|
||||
a loader already in session re-prompts after the knock's first byte
|
||||
while the second is still queued behind that reply — so the echo is
|
||||
matched byte for byte and anything else arriving in between is device
|
||||
traffic, held for the next read."""
|
||||
|
||||
def __init__(self, port):
|
||||
self._port = port
|
||||
self._pending = b""
|
||||
|
||||
def __getattr__(self, name):
|
||||
return getattr(self._port, name)
|
||||
|
||||
def write(self, data):
|
||||
data = bytes(data)
|
||||
self._port.write(data)
|
||||
# The echo arrives at line rate — 10 bits a byte — plus adapter
|
||||
# latency; a generous floor keeps slow rates and USB scheduling out
|
||||
# of the error path.
|
||||
deadline = time.monotonic() + 10 * len(data) / self._port.baud + 0.5
|
||||
remaining = data
|
||||
while remaining:
|
||||
budget = deadline - time.monotonic()
|
||||
if budget <= 0:
|
||||
raise Error(f"one-wire echo missing after {len(data) - len(remaining)} of "
|
||||
f"{len(data)} byte(s) — is the adapter's RX tied to the line?")
|
||||
byte = self._port.read_exact(1, budget)
|
||||
if byte == remaining[:1]:
|
||||
remaining = remaining[1:]
|
||||
else:
|
||||
self._pending += byte
|
||||
|
||||
def read_exact(self, count, timeout):
|
||||
taken, self._pending = self._pending[:count], self._pending[count:]
|
||||
if len(taken) == count:
|
||||
return taken
|
||||
return taken + self._port.read_exact(count - len(taken), timeout)
|
||||
|
||||
def read_available(self, wait):
|
||||
taken, self._pending = self._pending, b""
|
||||
return taken + self._port.read_available(0 if taken else wait)
|
||||
|
||||
def flush_input(self):
|
||||
self._pending = b""
|
||||
self._port.flush_input()
|
||||
|
||||
|
||||
# -------------------------------------------------------------- protocol ---
|
||||
|
||||
|
||||
@@ -1478,12 +1537,13 @@ def scan_report(baud, pct, version, clock=None):
|
||||
return lines
|
||||
|
||||
|
||||
def op_scan(port_path, baud, wait, clock=None):
|
||||
def op_scan(port_path, baud, wait, clock=None, one_wire=False):
|
||||
"""A fixed-baud loader whose oscillator drifted still answers — at the
|
||||
drifted ratio, since its rate scales with its clock. One probe per
|
||||
activation window, and with an application resident the window opens
|
||||
exactly once per reset, so each probe announces itself and expects a
|
||||
fresh reset before knocking."""
|
||||
fresh reset before knocking. On a shared line the probes echo back like
|
||||
everything else; undiscarded they would answer every rate."""
|
||||
for pct in scan_ratios():
|
||||
rate = scan_rate(baud, pct)
|
||||
print(f"scan: {rate} Bd ({pct:+d} %) — reset the target", flush=True)
|
||||
@@ -1492,6 +1552,8 @@ def op_scan(port_path, baud, wait, clock=None):
|
||||
except Error as unmakeable:
|
||||
print(f"scan: {rate} Bd skipped — {unmakeable}")
|
||||
continue
|
||||
if one_wire:
|
||||
port = OneWirePort(port)
|
||||
try:
|
||||
info = Loader(port).connect(wait)
|
||||
except Error:
|
||||
@@ -1517,6 +1579,9 @@ def main():
|
||||
parser.add_argument("--port", required=True, help="serial device: COM6, /dev/ttyUSB0, or a simavr pty")
|
||||
parser.add_argument("--baud", type=int, default=115200, help="115200 mega, 57600 tinies")
|
||||
parser.add_argument("--wait", type=float, default=30.0, help="seconds to keep knocking")
|
||||
parser.add_argument("--one-wire", action="store_true",
|
||||
help="the link is a shared line: read back and discard this tool's own "
|
||||
"echoed bytes (any backend of a one-wire deployment)")
|
||||
parser.add_argument("--autobaud", action="store_true",
|
||||
help="drive an autobaud loader: send the 0xC0 calibration pulse and a single "
|
||||
"knock, and take geometry from the signature (no clock/baud baked in)")
|
||||
@@ -1575,11 +1640,14 @@ def main():
|
||||
if args.scan:
|
||||
if args.autobaud:
|
||||
parser.error("--scan probes fixed rates; an autobaud loader has none to miss")
|
||||
op_scan(args.port, args.baud, args.wait, args.clock)
|
||||
op_scan(args.port, args.baud, args.wait, args.clock, args.one_wire)
|
||||
return
|
||||
|
||||
port = Port(args.port, args.baud)
|
||||
verbose(f"{args.port}: {args.baud} Bd 8N1, DTR/RTS asserted")
|
||||
if args.one_wire:
|
||||
port = OneWirePort(port)
|
||||
verbose(f"{args.port}: {args.baud} Bd 8N1, DTR/RTS asserted"
|
||||
+ (", one-wire echo discarded" if args.one_wire else ""))
|
||||
try:
|
||||
loader = Loader(port)
|
||||
info = loader.connect_autobaud(args.wait) if args.autobaud else loader.connect(args.wait)
|
||||
|
||||
Reference in New Issue
Block a user