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

phaser: fix oscillator rtio address for even base addresses 

close #1580
This commit is contained in:
Robert Jördens 2021-01-19 16:56:45 +01:00
parent 641f8bcdd6
commit 261870bdee
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/coredevice/phaser.py
View File

@ -928,7 +928,7 @@ class PhaserOscillator:
:param clr: Clear the phase accumulator (persistent) :param clr: Clear the phase accumulator (persistent)
""" """
data = (asf & 0x7fff) | ((clr & 1) << 15) | (pow << 16) data = (asf & 0x7fff) | ((clr & 1) << 15) | (pow << 16)
rtio_output(self.base_addr | (1 << 8), data) rtio_output(self.base_addr + (1 << 8), data)
@kernel @kernel
def set_amplitude_phase(self, amplitude, phase=0., clr=0): def set_amplitude_phase(self, amplitude, phase=0., clr=0):