From e40824123342ea67a1b2b335369a2ccdd5b518c0 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 1 Jun 2018 15:42:37 +0800 Subject: [PATCH] sawg: work around compiler not accepting delay_mu(int32) --- artiq/coredevice/sawg.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/artiq/coredevice/sawg.py b/artiq/coredevice/sawg.py index e3ff38c03..50623d8ea 100644 --- a/artiq/coredevice/sawg.py +++ b/artiq/coredevice/sawg.py @@ -352,20 +352,21 @@ class SAWG: self.config.set_out_min(-1.) self.config.set_out_max(1.) self.frequency0.set_mu(0) - delay_mu(self.core.ref_multiplier) + coarse_cycle = int64(self.core.ref_multiplier) + delay_mu(coarse_cycle) self.frequency1.set_mu(0) - delay_mu(self.core.ref_multiplier) + delay_mu(coarse_cycle) self.frequency2.set_mu(0) - delay_mu(self.core.ref_multiplier) + delay_mu(coarse_cycle) self.phase0.set_mu(0) - delay_mu(self.core.ref_multiplier) + delay_mu(coarse_cycle) self.phase1.set_mu(0) - delay_mu(self.core.ref_multiplier) + delay_mu(coarse_cycle) self.phase2.set_mu(0) - delay_mu(self.core.ref_multiplier) + delay_mu(coarse_cycle) self.amplitude1.set_mu(0) - delay_mu(self.core.ref_multiplier) + delay_mu(coarse_cycle) self.amplitude2.set_mu(0) - delay_mu(self.core.ref_multiplier) + delay_mu(coarse_cycle) self.offset.set_mu(0) - delay_mu(self.core.ref_multiplier) + delay_mu(coarse_cycle)