Skip to content

Clean up custom firmware IPs information and add QICK logo#353

Merged
meeg merged 16 commits intomainfrom
PR-42-clean-up-custom-firmware-ips-information-and-add-logo
Jul 25, 2025
Merged

Clean up custom firmware IPs information and add QICK logo#353
meeg merged 16 commits intomainfrom
PR-42-clean-up-custom-firmware-ips-information-and-add-logo

Conversation

@mmdiego
Copy link
Copy Markdown
Contributor

@mmdiego mmdiego commented Jul 22, 2025

These modifications don't change any functionality!

  • Updated Xilinx IPs information:

    • Vendor: QICK; Library: QICK; Vendor Display Name: Quantum Instrumentation Control Kit; Vendor URL: https://github.com/openquantumhardware/qick
    • Created categories: Timed_Processor, Signal Generator, Readout, Miscelaneous, QICK Peripherals, AXI Peripherals
    • Added QICK Logo to Block GUI
    • Updated project scripts to point to new IPs names
  • Updated software drivers to bind to the new names, though keeping old names for backward compatibility

@mmdiego mmdiego requested a review from lharnaldi July 22, 2025 20:24
@mmdiego mmdiego added documentation Improvements or additions to documentation software Anything related to Jupyter/Python scripts firmware Anything related to FPGA design labels Jul 22, 2025
@mmdiego mmdiego added this to the Next Release milestone Jul 22, 2025
@mmdiego mmdiego requested a review from treptow July 22, 2025 20:25
Copy link
Copy Markdown
Contributor Author

@mmdiego mmdiego left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's ready to merge now. @meeg do you have any option to squash the commits when merging?

@meeg
Copy link
Copy Markdown
Contributor

meeg commented Jul 24, 2025

Looks good to me. But what do you mean by "option"? If you want to do a squash merge that's fine with me, but I don't think it's necessary.

@mmdiego
Copy link
Copy Markdown
Contributor Author

mmdiego commented Jul 24, 2025

Looks good to me. But what do you mean by "option"? If you want to do a squash merge that's fine with me, but I don't think it's necessary.

Oh, in Gitlab there was a "Squash checkbox" next to the "Merge" button that allows to proceed with the merge doing a squash of the commits instead of the normal merge. I'm not sure how this is achieved with Github, but that's what I meant.

@meeg
Copy link
Copy Markdown
Contributor

meeg commented Jul 24, 2025

It's possible here as well if that's what you want, but typically I prefer a normal merge to keep more information about individual changes.

@mmdiego
Copy link
Copy Markdown
Contributor Author

mmdiego commented Jul 25, 2025

In this case I was suggesting doing a squash just to get rid of the back and forth about the Vendor description, but it's ok for me to go either way.

@meeg meeg merged commit 5571dc4 into main Jul 25, 2025
3 checks passed
meeg added a commit that referenced this pull request Aug 13, 2025
@meeg meeg deleted the PR-42-clean-up-custom-firmware-ips-information-and-add-logo branch August 13, 2025 18:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation firmware Anything related to FPGA design software Anything related to Jupyter/Python scripts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants