From 60a7e0e40d5fe4329ce8c61337cad4e4bfbd3d3b Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Tue, 24 Jul 2018 10:55:13 +0800 Subject: [PATCH] grabber: use usual order of ROI coordinates in cfg addresses --- artiq/gateware/rtio/phy/grabber.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/artiq/gateware/rtio/phy/grabber.py b/artiq/gateware/rtio/phy/grabber.py index fe4e9e3c2..8b9f05265 100644 --- a/artiq/gateware/rtio/phy/grabber.py +++ b/artiq/gateware/rtio/phy/grabber.py @@ -82,8 +82,8 @@ class Grabber(Module): self.gate_data.i) for n, roi_engine in enumerate(self.roi_engines): - for offset, target in enumerate([roi_engine.cfg.x0, roi_engine.cfg.x1, - roi_engine.cfg.y0, roi_engine.cfg.y1]): + for offset, target in enumerate([roi_engine.cfg.x0, roi_engine.cfg.y0, + roi_engine.cfg.x1, roi_engine.cfg.y1]): roi_boundary = Signal.like(target) roi_boundary.attr.add("no_retiming") self.sync.rtio += If(self.config.o.stb & (self.config.o.address == 4*n+offset),