From cba631610c360f1ca3698cadb5045e769b553019 Mon Sep 17 00:00:00 2001 From: SingularitySurfer Date: Fri, 4 Dec 2020 14:40:59 +0000 Subject: [PATCH 1/2] fixed phaser number of rtio channels --- artiq/frontend/artiq_ddb_template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artiq/frontend/artiq_ddb_template.py b/artiq/frontend/artiq_ddb_template.py index 3f208c4a7..1ea85b08a 100755 --- a/artiq/frontend/artiq_ddb_template.py +++ b/artiq/frontend/artiq_ddb_template.py @@ -498,7 +498,7 @@ class PeripheralManager: }}""", name=self.get_name("phaser"), channel=rtio_offset) - return 2 + return 6 def process(self, rtio_offset, peripheral): processor = getattr(self, "process_"+str(peripheral["type"])) From 9b4b550f760eacfb5c6609d8b60a787b11757347 Mon Sep 17 00:00:00 2001 From: SingularitySurfer Date: Fri, 4 Dec 2020 14:49:30 +0000 Subject: [PATCH 2/2] 5 is correct. --- artiq/frontend/artiq_ddb_template.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artiq/frontend/artiq_ddb_template.py b/artiq/frontend/artiq_ddb_template.py index 1ea85b08a..f40d2d60a 100755 --- a/artiq/frontend/artiq_ddb_template.py +++ b/artiq/frontend/artiq_ddb_template.py @@ -498,7 +498,7 @@ class PeripheralManager: }}""", name=self.get_name("phaser"), channel=rtio_offset) - return 6 + return 5 def process(self, rtio_offset, peripheral): processor = getattr(self, "process_"+str(peripheral["type"]))