Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update artiq.coredevice.urukul and artiq.coredevice.ad9910 for new Urukul capabilities #2657

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove unneeded read from sta_read
  • Loading branch information
newell committed Jan 25, 2025
commit ebbd37345c86eb64baac8d381376fc93788c270f
3 changes: 1 addition & 2 deletions artiq/coredevice/urukul.py
Original file line number Diff line number Diff line change
Expand Up @@ -465,13 +465,12 @@ def sta_read(self, cpld) -> TInt32:

:return: The status register value.
"""
cpld.bus.set_config_mu(SPI_CONFIG | spi.SPI_INPUT, 24, SPIT_CFG_RD, CS_CFG)
cpld.bus.set_config_mu(SPI_CONFIG, 24, SPIT_CFG_WR, CS_CFG)
cpld.bus.write(((cpld.cfg_reg >> 24) & 0xFFFFFF) << 8)
cpld.bus.set_config_mu(
SPI_CONFIG | spi.SPI_END | spi.SPI_INPUT, 28, SPIT_CFG_RD, CS_CFG
)
cpld.bus.write((cpld.cfg_reg & 0xFFFFFFF) << 4)
cpld.bus.read() # Upper 32 bits ignored
return cpld.bus.read()

@kernel
Expand Down