From 0b086225a9ede6bd6a9fe8b8efe0056251554336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Sat, 9 Jun 2018 07:33:47 +0000 Subject: [PATCH] sawg: don't use Cat() for signed signals c.f. #1039 #1040 #1022 #1058 #1044 --- artiq/gateware/dsp/sawg.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/artiq/gateware/dsp/sawg.py b/artiq/gateware/dsp/sawg.py index 6f983ba90..e0e9d1db4 100644 --- a/artiq/gateware/dsp/sawg.py +++ b/artiq/gateware/dsp/sawg.py @@ -183,8 +183,8 @@ class Channel(Module, SatAddMixin): b.ce.eq(cfg.ce), u.o.ack.eq(cfg.ce), Cat(b.clr, a1.clr, a2.clr).eq(cfg.clr), - Cat(b.xi).eq(Cat(hbf[0].o)), - Cat(b.yi).eq(Cat(hbf[1].o)), + [i.eq(j) for i, j in zip(b.xi, hbf[0].o)], + [i.eq(j) for i, j in zip(b.yi, hbf[1].o)], ] hbf[0].i.reset_less = True hbf[1].i.reset_less = True @@ -217,4 +217,4 @@ class Channel(Module, SatAddMixin): ] def connect_y(self, buddy): - self.comb += Cat(buddy.y_in).eq(Cat(self.b.yo)) + self.comb += [i.eq(j) for i, j in zip(buddy.y_in, self.b.yo)]