Compare commits

..
2 Commits
Author SHA1 Message Date
yuysh da94cc6cdc 🐛 fix: lambda closure crash + .bat version noise on Windows
Bug 1 — UartMonitorWindow crash on serial open failure:
- lambda: self._show_unavailable(str(e))  →  lambda e=e: ...
- Python 3 deletes 'e' after except block; default arg captures it

Bug 2 — xsct version shows 'ECHO 处于关闭状态。' on Windows:
- .bat wrappers output 'ECHO is off' / 'ECHO 处于关闭状态。' noise
- _is_batch_noise() filters known patterns (EN+ZH)
- Version regex now scans all output lines, skipping noise lines
- Path-based fallback (2023.2) catches any remaining undetectable cases
2026-06-11 15:18:08 +08:00
yuysh 70c88815cc feat: auto-discover Zynq IP after reboot (UART or UDP scan)
After Step 4 reboot, the Zynq may obtain a different IP via DHCP.

IP discovery strategy:
1. UART available → parse IP from boot output (fast, zero network traffic)
2. UART unavailable → scan 192.168.100.11–30 via UDP ver() probe
   (port = last_octet - 3, 0.5s timeout each, ~10s max for 20 IPs)

If IP changed → auto-update config.zynq_ip + UI field
2026-06-11 15:11:59 +08:00
3 changed files with 69 additions and 10 deletions
+40
View File
@@ -1146,6 +1146,7 @@ class MainWindow(ctk.CTk):
boot_delay = self._config.boot_wait_delay
uart_alive = (self._uart_monitor is not None
and self._uart_monitor.is_running())
discovered_ip: str = ""
if uart_alive:
self._log_message(f" ⏳ Waiting for UART boot signal (max {boot_delay}s)...")
elapsed = 0.0
@@ -1156,6 +1157,7 @@ class MainWindow(ctk.CTk):
f" ✓ Boot detected after {elapsed:.1f}s"
f" (IP={info.ip_address}, Ver={info.version})"
)
discovered_ip = info.ip_address
break
time.sleep(0.5)
elapsed += 0.5
@@ -1165,6 +1167,23 @@ class MainWindow(ctk.CTk):
self._log_message(f" ⏳ UART unavailable — sleeping {boot_delay}s for boot...")
time.sleep(boot_delay)
# Discover actual IP after reboot (may have changed via DHCP)
if not discovered_ip:
self._log_message(" Scanning for Zynq IP (192.168.100.1130)...")
discovered_ip = self._discover_zynq_ip()
if discovered_ip:
self._log_message(f" ✓ Found Zynq at {discovered_ip}")
else:
self._log_message(" ⚠ Zynq not found on any scanned IP")
if discovered_ip and discovered_ip != self._config.zynq_ip:
self._log_message(
f" IP changed: {self._config.zynq_ip}{discovered_ip}"
)
self._config.zynq_ip = discovered_ip
if self._ip_string_var:
self._ip_string_var.set(discovered_ip)
# 4e: Verify boot
self._log_message("Step 4e: Verifying boot...")
if hasattr(self, '_tftp_sub_step_frame'):
@@ -1655,6 +1674,27 @@ class MainWindow(ctk.CTk):
threading.Thread(target=_thread, daemon=True).start()
def _discover_zynq_ip(self) -> str:
"""Scan IP range to find the Zynq after reboot.
Sends UDP ver() to each candidate IP (port = last_octet - 3)
and returns the first IP that responds.
Returns:
Discovered IP address, or empty string if not found.
"""
subnet = "192.168.100"
for last in range(11, 31):
ip = f"{subnet}.{last}"
try:
from reboot_manager import _send_udp_command
ok, _resp = _send_udp_command(ip, b"ver()", timeout=0.5)
if ok:
return ip
except Exception:
continue
return ""
# ── Vitis Check ────────────────────────────────────────────
def _check_vitis(self) -> None:
+1 -1
View File
@@ -1079,7 +1079,7 @@ class UartMonitorWindow(ctk.CTkToplevel):
ser.close()
self.after(0, self._on_open_success)
except Exception as e:
self.after(0, lambda: self._show_unavailable(str(e)))
self.after(0, lambda e=e: self._show_unavailable(str(e)))
threading.Thread(target=_bg_open, daemon=True).start()
+26 -7
View File
@@ -324,7 +324,7 @@ def _get_tool_version(tool_path: str) -> str:
"""Get the version string from a tool executable.
Tries (in order):
1. tool -version
1. tool -version → parse version from output
2. Extract from path (e.g., .../Vitis/2023.2/bin/xsct → 2023.2)
Args:
@@ -343,14 +343,17 @@ def _get_tool_version(tool_path: str) -> str:
)
output = (result.stdout + result.stderr).strip()
if output:
# Look for a version pattern in output
m = re.search(r"(\d{4}\.\d+(?:\.\d+)?)", output)
# Scan all lines for a version pattern (skip batch echo noise)
for raw_line in output.splitlines():
line = raw_line.strip()
if not line:
continue
# Skip Windows batch echo noise
if _is_batch_noise(line):
continue
m = re.search(r"(\d{4}\.\d+(?:\.\d+)?)", line)
if m:
return m.group(1)
# Return first meaningful line (truncated)
line = output.split("\n")[0][:80]
if line and "usage" not in line.lower():
return line
except (subprocess.TimeoutExpired, OSError):
pass
@@ -358,6 +361,22 @@ def _get_tool_version(tool_path: str) -> str:
return _version_from_path(tool_path)
def _is_batch_noise(line: str) -> bool:
"""Check if a line is Windows batch script noise.
Args:
line: A line of output text.
Returns:
True if the line looks like batch echo/status noise.
"""
noise_patterns = [
r"^ECHO\s+(is\s+(on|off)|处于)", # ECHO is on/off (en+zh)
r"^[A-Z]:\\[^>]*>", # Prompt line like C:\path>
]
return any(re.search(p, line, re.IGNORECASE) for p in noise_patterns)
# ── Main check function ──────────────────────────────────────────────