feat(gui): add FT601Connection class, USB interface selection in V65/V7
- Add FT601Connection in radar_protocol.py using ftd3xx library with proper setChipConfiguration re-enumeration handling (close, wait 2s, re-open) and 4-byte write alignment - Add USB Interface dropdown to V65 Tk GUI (FT2232H default, FT601 option) - Add USB Interface combo to V7 PyQt dashboard with Live/File mode toggle - Fix mock frame_start bit 7 in both FT2232H and FT601 connections - Use FPGA range data from USB packets instead of recomputing in Python - Export FT601Connection from v7/hardware.py and v7/__init__.py - Add 7 FT601Connection tests (91 total in test_GUI_V65_Tk.py)
This commit is contained in:
Jason
@@ -59,7 +59,7 @@ except (ModuleNotFoundError, ImportError):
|
||||
|
||||
# Import protocol layer (no GUI deps)
|
||||
from radar_protocol import (
|
||||
RadarProtocol, FT2232HConnection,
|
||||
RadarProtocol, FT2232HConnection, FT601Connection,
|
||||
DataRecorder, RadarAcquisition,
|
||||
RadarFrame, StatusResponse,
|
||||
NUM_RANGE_BINS, NUM_DOPPLER_BINS, WATERFALL_DEPTH,
|
||||
@@ -388,10 +388,11 @@ class RadarDashboard:
|
||||
BANDWIDTH = 500e6 # Hz — chirp bandwidth
|
||||
C = 3e8 # m/s — speed of light
|
||||
|
||||
def __init__(self, root: tk.Tk, connection: FT2232HConnection,
|
||||
def __init__(self, root: tk.Tk, mock: bool,
|
||||
recorder: DataRecorder, device_index: int = 0):
|
||||
self.root = root
|
||||
self.conn = connection
|
||||
self._mock = mock
|
||||
self.conn: FT2232HConnection | FT601Connection | None = None
|
||||
self.recorder = recorder
|
||||
self.device_index = device_index
|
||||
|
||||
@@ -485,6 +486,16 @@ class RadarDashboard:
|
||||
style="Accent.TButton")
|
||||
self.btn_connect.pack(side="right", padx=4)
|
||||
|
||||
# USB Interface selector (production FT2232H / premium FT601)
|
||||
self._usb_iface_var = tk.StringVar(value="FT2232H (Production)")
|
||||
self.cmb_usb_iface = ttk.Combobox(
|
||||
top, textvariable=self._usb_iface_var,
|
||||
values=["FT2232H (Production)", "FT601 (Premium)"],
|
||||
state="readonly", width=20,
|
||||
)
|
||||
self.cmb_usb_iface.pack(side="right", padx=4)
|
||||
ttk.Label(top, text="USB:", font=("Menlo", 10)).pack(side="right")
|
||||
|
||||
self.btn_record = ttk.Button(top, text="Record", command=self._on_record)
|
||||
self.btn_record.pack(side="right", padx=4)
|
||||
|
||||
@@ -1018,15 +1029,17 @@ class RadarDashboard:
|
||||
|
||||
# ------------------------------------------------------------ Actions
|
||||
def _on_connect(self):
|
||||
if self.conn.is_open:
|
||||
if self.conn is not None and self.conn.is_open:
|
||||
# Disconnect
|
||||
if self._acq_thread is not None:
|
||||
self._acq_thread.stop()
|
||||
self._acq_thread.join(timeout=2)
|
||||
self._acq_thread = None
|
||||
self.conn.close()
|
||||
self.conn = None
|
||||
self.lbl_status.config(text="DISCONNECTED", foreground=RED)
|
||||
self.btn_connect.config(text="Connect")
|
||||
self.cmb_usb_iface.config(state="readonly")
|
||||
log.info("Disconnected")
|
||||
return
|
||||
|
||||
@@ -1036,6 +1049,16 @@ class RadarDashboard:
|
||||
if self._replay_active:
|
||||
self._replay_stop()
|
||||
|
||||
# Create connection based on USB Interface selector
|
||||
iface = self._usb_iface_var.get()
|
||||
if "FT601" in iface:
|
||||
self.conn = FT601Connection(mock=self._mock)
|
||||
else:
|
||||
self.conn = FT2232HConnection(mock=self._mock)
|
||||
|
||||
# Disable interface selector while connecting/connected
|
||||
self.cmb_usb_iface.config(state="disabled")
|
||||
|
||||
# Open connection in a background thread to avoid blocking the GUI
|
||||
self.lbl_status.config(text="CONNECTING...", foreground=YELLOW)
|
||||
self.btn_connect.config(state="disabled")
|
||||
@@ -1062,6 +1085,8 @@ class RadarDashboard:
|
||||
else:
|
||||
self.lbl_status.config(text="CONNECT FAILED", foreground=RED)
|
||||
self.btn_connect.config(text="Connect")
|
||||
self.cmb_usb_iface.config(state="readonly")
|
||||
self.conn = None
|
||||
|
||||
def _on_record(self):
|
||||
if self.recorder.recording:
|
||||
@@ -1110,6 +1135,9 @@ class RadarDashboard:
|
||||
f"Opcode 0x{opcode:02X} is hardware-only (ignored in replay)"))
|
||||
return
|
||||
cmd = RadarProtocol.build_command(opcode, value)
|
||||
if self.conn is None:
|
||||
log.warning("No connection — command not sent")
|
||||
return
|
||||
ok = self.conn.write(cmd)
|
||||
log.info(f"CMD 0x{opcode:02X} val={value} ({'OK' if ok else 'FAIL'})")
|
||||
|
||||
@@ -1148,7 +1176,7 @@ class RadarDashboard:
|
||||
if self._replay_active or self._replay_ctrl is not None:
|
||||
self._replay_stop()
|
||||
if self._acq_thread is not None:
|
||||
if self.conn.is_open:
|
||||
if self.conn is not None and self.conn.is_open:
|
||||
self._on_connect() # disconnect
|
||||
else:
|
||||
# Connection dropped unexpectedly — just clean up the thread
|
||||
@@ -1547,17 +1575,17 @@ def main():
|
||||
args = parser.parse_args()
|
||||
|
||||
if args.live:
|
||||
conn = FT2232HConnection(mock=False)
|
||||
mock = False
|
||||
mode_str = "LIVE"
|
||||
else:
|
||||
conn = FT2232HConnection(mock=True)
|
||||
mock = True
|
||||
mode_str = "MOCK"
|
||||
|
||||
recorder = DataRecorder()
|
||||
|
||||
root = tk.Tk()
|
||||
|
||||
dashboard = RadarDashboard(root, conn, recorder, device_index=args.device)
|
||||
dashboard = RadarDashboard(root, mock, recorder, device_index=args.device)
|
||||
|
||||
if args.record:
|
||||
filepath = os.path.join(
|
||||
@@ -1582,8 +1610,8 @@ def main():
|
||||
if dashboard._acq_thread is not None:
|
||||
dashboard._acq_thread.stop()
|
||||
dashboard._acq_thread.join(timeout=2)
|
||||
if conn.is_open:
|
||||
conn.close()
|
||||
if dashboard.conn is not None and dashboard.conn.is_open:
|
||||
dashboard.conn.close()
|
||||
if recorder.recording:
|
||||
recorder.stop()
|
||||
root.destroy()
|
||||
|
||||
Reference in New Issue
Block a user