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

fix ors

This commit is contained in:
SingularitySurfer 2022-06-21 07:36:59 +00:00
parent d09153411f
commit 5df766e6da
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
artiq/coredevice/phaser.py
View File

@ -1058,7 +1058,7 @@ class PhaserChannel:
self.trf_write(data) self.trf_write(data)
@kernel @kernel
def set_servo(self, bypass=1, hold=0, profile=0): def set_servo(self, profile=0, bypass=1, hold=0):
"""Set the servo configuration. """Set the servo configuration.
:param bypass: 1 to enable bypass (default), 0 to engage servo :param bypass: 1 to enable bypass (default), 0 to engage servo
@ -1068,13 +1068,14 @@ class PhaserChannel:
if (profile < 0) or (profile > 3): if (profile < 0) or (profile > 3):
raise ValueError("invalid profile index") raise ValueError("invalid profile index")
addr = PHASER_ADDR_SERVO_CFG0 + self.index addr = PHASER_ADDR_SERVO_CFG0 + self.index
data = 0
if bypass == 0: if bypass == 0:
data = 1 data = 1
if hold == 1: if hold == 1:
data = data or (1 << 1) data = data | (1 << 1)
if bypass: if bypass:
hold = 1 hold = 1
data = (profile << 2) or (hold << 1) or (bypass << 0) data = (profile << 2) | (hold << 1) | (bypass << 0)
self.phaser.write8(addr, data) self.phaser.write8(addr, data)
@kernel @kernel