occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

examples/nac3devices: fix and reenable Phaser

This commit is contained in:
Sebastien Bourdeauducq 2022-03-01 11:49:03 +08:00
parent b66cce14fb
commit 5af22af5f6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/coredevice/phaser.py
View File

@ -192,6 +192,7 @@ class Phaser:
self.sync_dly = sync_dly self.sync_dly = sync_dly
self.dac_mmap = DAC34H84(dac).get_mmap() self.dac_mmap = DAC34H84(dac).get_mmap()
self.dac_mmap = [int32(x) for x in self.dac_mmap] # NAC3TODO https://git.m-labs.hk/M-Labs/nac3/issues/14
self.channel = [PhaserChannel(self, ch, trf) self.channel = [PhaserChannel(self, ch, trf)
for ch, trf in enumerate([trf0, trf1])] for ch, trf in enumerate([trf0, trf1])]
@ -810,6 +811,7 @@ class PhaserChannel:
self.phaser = phaser self.phaser = phaser
self.index = index self.index = index
self.trf_mmap = TRF372017(trf).get_mmap() self.trf_mmap = TRF372017(trf).get_mmap()
self.trf_mmap = [int32(x) for x in self.trf_mmap] # NAC3TODO https://git.m-labs.hk/M-Labs/nac3/issues/14
self.oscillator = [PhaserOscillator(self, osc) for osc in range(5)] self.oscillator = [PhaserOscillator(self, osc) for osc in range(5)]

4
artiq/examples/nac3devices/nac3devices.py
View File

@ -26,7 +26,7 @@ class NAC3Devices(EnvExperiment):
ttl0_counter: KernelInvariant[EdgeCounter] ttl0_counter: KernelInvariant[EdgeCounter]
grabber0: KernelInvariant[Grabber] grabber0: KernelInvariant[Grabber]
fastino0: KernelInvariant[Fastino] fastino0: KernelInvariant[Fastino]
# NAC3TODO segfault phaser0: KernelInvariant[Fastino] phaser0: KernelInvariant[Phaser]
def build(self): def build(self):
self.setattr_device("core") self.setattr_device("core")
@ -40,7 +40,7 @@ class NAC3Devices(EnvExperiment):
self.setattr_device("ttl0_counter") self.setattr_device("ttl0_counter")
self.setattr_device("grabber0") self.setattr_device("grabber0")
self.setattr_device("fastino0") self.setattr_device("fastino0")
# NAC3TODO segfault self.setattr_device("phaser0") self.setattr_device("phaser0")
@kernel @kernel
def run(self): def run(self):