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

mem auto increment

This commit is contained in:
Robert Jördens 2022-09-04 12:03:44 +00:00
parent f4d325112c
commit fa3678f8a3
1 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
artiq/coredevice/phaser.py
View File

@ -1290,56 +1290,38 @@ class Miqro:
(self.channel.index << 15) | addr) (self.channel.index << 15) | addr)
self.channel.phaser.write32(PHASER_ADDR_MIQRO_MEM_DATA, data) self.channel.phaser.write32(PHASER_ADDR_MIQRO_MEM_DATA, data)
@kernel
def read32(self, addr):
self.channel.phaser.write16(PHASER_ADDR_MIQRO_MEM_ADDR,
(self.channel.index << 15) | addr)
return self.channel.phaser.read32(PHASER_ADDR_MIQRO_MEM_DATA)
@kernel @kernel
def reset(self): def reset(self):
for osc in range(16): for osc in range(16):
for pro in range(32): for pro in range(32):
self.set_frequency_mu(osc, pro, 0) self.set_profile_mu(osc, pro, 0, 0, 0)
self.set_amplitude_phase_mu(osc, pro, 0, 0)
delay(20*us) delay(20*us)
self.set_window_mu( self.set_window_mu(
start=0, data=[[0, 0]], rate=1, shift=0, order=0, head=0, tail=1) start=0, data=[[0, 0]], rate=1, shift=0, order=0, head=0, tail=1)
# naive check that we are actually writing something
if self.read32(0) != (1 << 31) | 2 or self.read32(1) != 0:
raise ValueError("window write failed")
delay(100*us)
self.pulse(window=0, profiles=[0]) self.pulse(window=0, profiles=[0])
@kernel @kernel
def set_frequency_mu(self, oscillator, profile, ftw): def set_profile_mu(self, oscillator, profile, ftw, asf, pow=0):
if oscillator >= 16: if oscillator >= 16:
raise ValueError("invalid oscillator index") raise ValueError("invalid oscillator index")
if profile >= 32: if profile >= 32:
raise ValueError("invalid profile index") raise ValueError("invalid profile index")
self.write32((1 << 14) | (oscillator << 6) | (profile << 1), ftw) self.channel.phaser.write16(PHASER_ADDR_MIQRO_MEM_ADDR,
(self.channel.index << 15) | (1 << 14) | (oscillator << 6) |
@kernel (profile << 1))
def set_frequency(oscillator, profile, frequency): self.channel.phaser.write32(PHASER_ADDR_MIQRO_MEM_DATA, ftw)
ftw = int32(round(frequency*((1 << 30)/(62.5*MHz)))) self.channel.phaser.write32(PHASER_ADDR_MIQRO_MEM_DATA,
self.set_frequency_mu(ftw)
@kernel
def set_amplitude_phase_mu(self, oscillator, profile, asf, pow=0):
if oscillator >= 16:
raise ValueError("invalid oscillator index")
if profile >= 32:
raise ValueError("invalid profile index")
self.write32((1 << 14) | (oscillator << 6) | (profile << 1) | 1,
(asf & 0xffff) | (pow << 16)) (asf & 0xffff) | (pow << 16))
@kernel @kernel
def set_amplitude_phase(self, oscillator, profile, amplitude, phase=0): def set_profile(oscillator, profile, frequency, amplitude, phase=0.):
# frequency is interpreted in the Nyquist sense, i.e. aliased
ftw = int32(round(frequency*((1 << 30)/(62.5*MHz))))
asf = int32(round(amplitude*0xffff)) asf = int32(round(amplitude*0xffff))
if asf < 0 or asf > 0xffff: if asf < 0 or asf > 0xffff:
raise ValueError("amplitude out of bounds") raise ValueError("amplitude out of bounds")
pow = int32(round(phase*(1 << 16))) pow = int32(round(phase*(1 << 16)))
self.set_amplitude_phase_mu(oscillator, profile, asf, pow) self.set_profile_mu(oscillator, profile, ftw, asf, pow)
@kernel @kernel
def set_window_mu(self, start, data, rate=1, shift=0, order=0, head=0, tail=0): def set_window_mu(self, start, data, rate=1, shift=0, order=0, head=0, tail=0):
@ -1353,8 +1335,9 @@ class Miqro:
raise ValueError("shift out of bounds") raise ValueError("shift out of bounds")
if order > 3: if order > 3:
raise ValueError("order out of bounds") raise ValueError("order out of bounds")
addr = start self.channel.phaser.write16(PHASER_ADDR_MIQRO_MEM_ADDR,
self.write32(addr, (self.channel.index << 15) | start)
self.channel.phaser.write32(PHASER_ADDR_MIQRO_MEM_DATA,
((start + 1 + len(data)) & 0x3ff) ((start + 1 + len(data)) & 0x3ff)
| ((rate - 1) << 10) | ((rate - 1) << 10)
| (shift << 22) | (shift << 22)
@ -1362,10 +1345,11 @@ class Miqro:
| ((head & 1) << 30) | ((head & 1) << 30)
| ((tail & 1) << 31) | ((tail & 1) << 31)
) )
for i in range(len(data)): for d in data:
addr += 1 self.channel.phaser.write32(PHASER_ADDR_MIQRO_MEM_DATA,
self.write32(addr, (data[i][0] & 0xffff) | (data[i][1] << 16)) (d[0] & 0xffff) | (d[1] << 16))
delay(10*us) delay(10*us)
return (start + 1 + len(data)) & 0x3ff
@kernel @kernel
def pulse(self, window, profiles): def pulse(self, window, profiles):