From 07f5e99140285c047e00748ccb9fd466b175d6f9 Mon Sep 17 00:00:00 2001 From: Robert Jordens Date: Thu, 22 Jun 2017 18:24:22 +0200 Subject: [PATCH] dsp/sat_add: works after previous changes --- artiq/gateware/dsp/tools.py | 1 - artiq/gateware/test/dsp/test_satadd.py | 2 -- 2 files changed, 3 deletions(-) diff --git a/artiq/gateware/dsp/tools.py b/artiq/gateware/dsp/tools.py index d4ddb2158..c198d1706 100644 --- a/artiq/gateware/dsp/tools.py +++ b/artiq/gateware/dsp/tools.py @@ -66,5 +66,4 @@ class SatAddMixin: limited.eq(limits[1]), ) ] - self.comb += limited.eq(full) return limited diff --git a/artiq/gateware/test/dsp/test_satadd.py b/artiq/gateware/test/dsp/test_satadd.py index 1f408ef0b..2121d4287 100644 --- a/artiq/gateware/test/dsp/test_satadd.py +++ b/artiq/gateware/test/dsp/test_satadd.py @@ -58,11 +58,9 @@ class SatAddTest(unittest.TestCase): def test_inst(self): pass - @unittest.skip("limiter disabled") def test_run(self): self._sweep() - @unittest.skip("limiter disabled") def test_limits(self): for l0 in -8, 0, 1, 7: for l1 in -8, 0, 1, 7: