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

flip logic of enable bit to bypass bit and update some comments

This commit is contained in:
SingularitySurfer 2022-06-23 10:08:34 +00:00
parent ab097b8ef9
commit 3f8a221c76
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artiq/coredevice/phaser.py
View File

@ -1094,7 +1094,7 @@ class PhaserChannel:
raise ValueError("invalid profile index") raise ValueError("invalid profile index")
addr = PHASER_ADDR_SERVO_CFG0 + self.index addr = PHASER_ADDR_SERVO_CFG0 + self.index
# enforce hold if the servo is bypassed # enforce hold if the servo is bypassed
data = (profile << 2) | (((hold | bypass) & 1) << 1) | (~bypass & 1) data = (profile << 2) | (((hold | bypass) & 1) << 1) | (bypass & 1)
self.phaser.write8(addr, data) self.phaser.write8(addr, data)
@kernel @kernel
@ -1130,7 +1130,7 @@ class PhaserChannel:
""" """
if (profile < 0) or (profile > 3): if (profile < 0) or (profile > 3):
raise ValueError("invalid profile index") raise ValueError("invalid profile index")
# 24 byte-sized ab registers per channel and 6 (2 bytes * 3 coefficients) registers per profile # 32 byte-sized data registers per channel and 8 (2 bytes * (3 coefficients + 1 offset)) registers per profile
addr = PHASER_ADDR_SERVO_DATA_BASE + (8 * profile) + (self.index * 32) addr = PHASER_ADDR_SERVO_DATA_BASE + (8 * profile) + (self.index * 32)
for data in [b0, b1, a1, offset]: for data in [b0, b1, a1, offset]:
self.phaser.write16(addr, data) self.phaser.write16(addr, data)