M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

artiq_sinara_tester: Fix NAC3 compilation failures 

- Fix incorrect types for bin-op/function call
- Explicitly invoke exception constructor for raise statement

Signed-off-by: David Mak <csdavidmak@ust.hk>
This commit is contained in:
David Mak 2023-10-30 15:10:09 +08:00 committed by Sébastien Bourdeauducq
parent d0a3ba2bc0
commit e60d5cab05
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
artiq/frontend/artiq_sinara_tester.py Normal file → Executable file
View File

@ -595,10 +595,10 @@ class SinaraTester(EnvExperiment):
if phaser.gw_rev == PHASER_GW_BASE: if phaser.gw_rev == PHASER_GW_BASE:
phaser.channel[0].set_duc_frequency(duc) phaser.channel[0].set_duc_frequency(duc)
phaser.channel[0].set_duc_cfg() phaser.channel[0].set_duc_cfg()
phaser.channel[0].set_att(6*dB) phaser.channel[0].set_att(6.*dB)
phaser.channel[1].set_duc_frequency(-duc) phaser.channel[1].set_duc_frequency(-duc)
phaser.channel[1].set_duc_cfg() phaser.channel[1].set_duc_cfg()
phaser.channel[1].set_att(6*dB) phaser.channel[1].set_att(6.*dB)
phaser.duc_stb() phaser.duc_stb()
self.core.delay(1.*ms) self.core.delay(1.*ms)
for i in range(len(osc)): for i in range(len(osc)):
@ -609,20 +609,20 @@ class SinaraTester(EnvExperiment):
self.core.delay(1.*ms) self.core.delay(1.*ms)
elif phaser.gw_rev == PHASER_GW_MIQRO: elif phaser.gw_rev == PHASER_GW_MIQRO:
for ch in range(2): for ch in range(2):
phaser.channel[ch].set_att(6*dB) phaser.channel[ch].set_att(6.*dB)
phaser.channel[ch].set_duc_cfg() phaser.channel[ch].set_duc_cfg()
sign = 1. - 2.*ch sign = 1. - 2.*float(ch)
for i in range(len(osc)): for i in range(len(osc)):
phaser.channel[ch].miqro.set_profile(i, profile=1, phaser.channel[ch].miqro.set_profile(i, profile=1,
frequency=sign*(duc + osc[i]), amplitude=1./len(osc)) frequency=sign*(duc + osc[i]), amplitude=1./float(len(osc)))
self.core.delay(100.*us) self.core.delay(100.*us)
phaser.channel[ch].miqro.set_window( phaser.channel[ch].miqro.set_window(
start=0x000, iq=[[1., 0.]], order=0, tail=0) start=0x000, iq=[(1., 0.)], order=0, tail=False)
phaser.channel[ch].miqro.pulse( phaser.channel[ch].miqro.pulse(
window=0x000, profiles=[1 for _ in range(len(osc))]) window=0x000, profiles=[1 for _ in range(len(osc))])
self.core.delay(1.*ms) self.core.delay(1.*ms)
else: else:
raise ValueError raise ValueError()
@kernel @kernel
def phaser_led_wave(self, phasers: list[Phaser]): def phaser_led_wave(self, phasers: list[Phaser]):