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

phaser: cleanup

This commit is contained in:
Robert Jördens 2022-10-19 16:25:33 +02:00
parent a1a4545ed4
commit 1820e1f715
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
artiq/frontend/artiq_sinara_tester.py
View File

@ -8,6 +8,7 @@ import sys
from artiq.experiment import * from artiq.experiment import *
from artiq.coredevice.ad9910 import AD9910, SyncDataEeprom from artiq.coredevice.ad9910 import AD9910, SyncDataEeprom
from artiq.coredevice.phaser import PHASER_GW_BASE, PHASER_GW_MIQRO
from artiq.master.databases import DeviceDB from artiq.master.databases import DeviceDB
from artiq.master.worker_db import DeviceManager from artiq.master.worker_db import DeviceManager
@ -86,7 +87,7 @@ class SinaraTester(EnvExperiment):
elif (module, cls) == ("artiq.coredevice.fastino", "Fastino"): elif (module, cls) == ("artiq.coredevice.fastino", "Fastino"):
self.fastinos[name] = self.get_device(name) self.fastinos[name] = self.get_device(name)
elif (module, cls) == ("artiq.coredevice.phaser", "Phaser"): elif (module, cls) == ("artiq.coredevice.phaser", "Phaser"):
self.phasers[name] = self.get_device(name) self. import PHASER_GW_BASE, PHASER_GW_MIQROphasers[name] = self.get_device(name)
elif (module, cls) == ("artiq.coredevice.grabber", "Grabber"): elif (module, cls) == ("artiq.coredevice.grabber", "Grabber"):
self.grabbers[name] = self.get_device(name) self.grabbers[name] = self.get_device(name)
elif (module, cls) == ("artiq.coredevice.mirny", "Mirny"): elif (module, cls) == ("artiq.coredevice.mirny", "Mirny"):
@ -570,7 +571,7 @@ class SinaraTester(EnvExperiment):
self.core.break_realtime() self.core.break_realtime()
phaser.init() phaser.init()
delay(1*ms) delay(1*ms)
if phaser.gw_rev == 1: # base if phaser.gw_rev == PHASER_GW_BASE: # 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)
@ -585,7 +586,7 @@ class SinaraTester(EnvExperiment):
phaser.channel[1].oscillator[i].set_frequency(-osc[i]) phaser.channel[1].oscillator[i].set_frequency(-osc[i])
phaser.channel[1].oscillator[i].set_amplitude_phase(.2) phaser.channel[1].oscillator[i].set_amplitude_phase(.2)
delay(1*ms) delay(1*ms)
elif phaser.gw_rev == 2: # miqro elif phaser.gw_rev == PHASER_GW_BASE: # 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(select=0) phaser.channel[ch].set_duc_cfg(select=0)
@ -599,6 +600,8 @@ class SinaraTester(EnvExperiment):
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))])
delay(1*ms) delay(1*ms)
else:
raise ValueError
@kernel @kernel
def phaser_led_wave(self, phasers): def phaser_led_wave(self, phasers):

1
artiq/gateware/rtio/phy/phaser.py
View File

@ -1,6 +1,5 @@
from migen import * from migen import *
from misoc.cores.duc import MultiDDS from misoc.cores.duc import MultiDDS
from misoc.interconnect.stream import Endpoint
from artiq.gateware.rtio import rtlink from artiq.gateware.rtio import rtlink
from .fastlink import SerDes, SerInterface from .fastlink import SerDes, SerInterface