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.

Sign up for GitHub

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

Jump to bottom

use full version of ipq-pynq-utils package #301

Merged
merged 68 commits into from
Dec 27, 2024
Merged

use full version of ipq-pynq-utils package #301

merged 68 commits into from
Dec 27, 2024

Conversation

meeg
Copy link
Collaborator

@meeg meeg commented Dec 27, 2024

We've been using parts of https://github.com/kit-ipq/ipq-pynq-utils to configure the LMX2594 clock chips on our ZCU111 frontend. This replaces our stripped-down and modified subset of ipq-pynq-utils with the full package (imported as a subtree). We have made various changes to ipq-pynq-utils to merge in our changes and get rid of extra dependencies, and are submitting those changes back to ipq-pynq-utils.

The long-term purpose of these changes is to let us use ipq-pynq-utils instead of xrfclk for the initial configuration of the clock chips on the RFSoC boards (we are doing some ugly hacks with xrfclk to change config parameters) and readback of the clock chip status (totally unsupported by xrfclk).

For developers: when making changes to files in the ipq-pynq-utils directory, it's easiest if those changes are made in the openquantumhardware/ipq-pynq-utils repository. Then pull the subtree into the qick repository by running the following command in the base directory of the qick repo:

git subtree pull --prefix qick_lib/qick/ipq_pynq_utils https://github.com/openquantumhardware/ipq-pynq-utils.git master

It's possible to make the change in qick and push it to ipq-pynq-utils, but somewhat less nice. See https://gist.github.com/SKempin/b7857a6ff6bddb05717cc17a44091202 for more about subtrees.

Yamakaja and others added 30 commits June 9, 2022 17:04
@Yamakaja
Initial commit
b7a4ea1
@Yamakaja
Add .gitignore
0436a2d
@Yamakaja
Add jupyter notebook checkpoints to .gitignore
511e825
@Yamakaja
Improve CLK104 clock output abstractions
3b831a6
@Yamakaja
Add README.md
c6138ac
@Yamakaja
Add setup.py to allow module installation
c8de569
@Yamakaja
Add ZCU208Board class
c303cc1
@Yamakaja
Fix imports
384dd82
@Yamakaja
Add spidev to install dependencies
c7dda8b
@Yamakaja
Add clock summary debug output
3b1975d
@Yamakaja
Add clockfiles
669e827
@Yamakaja
ZCU208Board: Automatically configure clocks and perform MTS
53a2383
@Yamakaja
Add LMX2594 REGMAP
28cf2d8
@Yamakaja
Implemenet LMX2594 regmap parsing
0baf5f4
@Yamakaja
Reintroduce xrfdc import
e4b318e
@Yamakaja
boards: Fixed typos
0cb23e0
@Yamakaja
boards: Fix more typos
06911ac
@Yamakaja
Change external ref frequency to 10 MHz
767d155
@Yamakaja
Implement LMX2594 calibration
dad0ec7
@Yamakaja
LMX2594: Implement frequency target solver
ee53a7d
@Yamakaja
ZCU208: Switch to new clock interface
68f022c
@Yamakaja
Update notebooks
3e601cb
@Yamakaja
Update ZCU208 class to write lmk registers
ddb9175
@Yamakaja
Update clock models
e26e99c
@Yamakaja
Improve user interface
3d5e1b4
@Yamakaja
Fix typo in clock requirements
f67d87a
@PatrickMat
Update README.md
911e8f5 
Fix typo
@Yamakaja
Improve setup procedure to include python version check
f2e0ec8
@Yamakaja
Update README.md
50a35a9
@Yamakaja
Fix setup.py to not import required modules
d28c50f
PatrickMat and others added 28 commits June 5, 2023 11:32
@PatrickMat
Add dac_processing function
121e23e
@PatrickMat
Bugfix dac_processing
264e61d
@PatrickMat
Buxfix data_processing.py
8b9028f 
imported numpy
@PatrickMat
Bugfix adc_processing
3f2fcb7
@meeg
use open_text() instead of files() for compatibility with Python 3.8 …
6412743 
…(PYNQ 2.7)
@meeg
fix bugs in my usage of open_text()
6db553f
@meeg
handle clockFiles subdirectory correctly
0a4f466
@meeg
DC amp gain readback for debug
1c91caf
@meeg
remove importlib_resources, which we no longer use
175774d
@meeg
remove utils.py, which is no longer used
8f83782
@meeg
add reimplementation of spidev
aa8715b
@meeg
remove more version check code
4e128ac
@meeg
Merge branch 'kit-ipq' into spidev
d87df96
@meeg
remove spidev dependency
e63e054
@meeg
add "verbose" option to turn off printout from set_output_frequency
5195fa8
@meeg
add en_b option to enable output B
ab86404
@meeg
clean up our ipq_pynq_utils
5b01df6
@meeg
replace importlib with __file__, to allow loading the package as a su…
0676fa2 
…bmodule
@meeg
Merge branch 'kit-ipq' into rfb_merge
f16a5b3
@meeg
Add 'qick_lib/qick/ipq_pynq_utils/' from commit 'ab8640457b270e83faef…
945e0a8 
…90962c23d0041434589a'

git-subtree-dir: qick_lib/qick/ipq_pynq_utils
git-subtree-mainline: 5b01df6
git-subtree-split: ab86404
@meeg
Merge commit 'f16a5b34b3640dd40e8cae292ea046237d4205d8' into main
019c926
@meeg
compatibility changes to use ipq-pynq-utils without changes
173b36f
@meeg
add find_addrs() to make it easier to read/write specific parameters
22a32b5
@meeg
Merge commit '22a32b527717f9cc7b1f9ba4d75a065173863680' into main
93e6d65
@meeg
use new RegisterDevice.find_addrs()
4850f3a
@meeg
change setup.py to find IPQ files in their new locations
eecd1b8
@meeg
one more data file
d756a01
@qickbot
update version
3432660
@meeg meeg merged commit ce95a2c into openquantumhardware:main Dec 27, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@meeg @Yamakaja @PatrickMat @qickbot