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

EMP FPGA2 #343

Merged
merged 29 commits into from
Oct 30, 2024
Merged

EMP FPGA2 #343

merged 29 commits into from
Oct 30, 2024

Conversation

mcoshiro
Copy link
Contributor

@mcoshiro mcoshiro commented Jul 5, 2024

Adds EMP integration for dual FPGA project including working second FPGA project. The first FPGA project will not work until its branch is also merged into master. Includes

  • New DualFPGA folder in integration test with all 2 FPGA project specific EMP code
  • Small changes to common emp code in IntegrationTests/common
  • Small changes to EMP-related files in IntegrationTests/CombinedBarrelConfig and IntegrationTests/ReducedCombinedConfig that were accidentally in common despite being configuration specific

Associated with project_generation_scripts #63. Associated KF branch will need to be reconciled with master after DR updates.

pwittich and others added 25 commits October 28, 2024 09:02
@pwittich @mcoshiro
rudiments of a dual-fpga EMP project
29dedc7
@pwittich @mcoshiro
updates for decl files
425c417
@pwittich @mcoshiro
move files to proper locations
4d453a9
@pwittich @mcoshiro
dummy payload test
5feb295
@pwittich @mcoshiro
update dependencies
5ff7705
@pwittich @mcoshiro
Updates for dual-FPGA using latest emp fwk
8866d5a
@pwittich @mcoshiro
F1 builds
64100be
@pwittich @mcoshiro
working build for F2 with trivial payload (CSP test)
b6247f1
@pwittich @mcoshiro
update build script
2ee95e9
@pwittich @mcoshiro
Update emp_project_decl_f2.vhd
fa3409e 
fix which inter-fpga quads are implemented on F2
@pwittich @mcoshiro
update to tags on emp-fwk and CM_FPGA_FW
bfffaab
@pwittich @mcoshiro
emp-fwk to 0.9.0-alpha2
ee4f45a
@pwittich @mcoshiro
more updates for 0.9.0-pre2
3860164
@pwittich @mcoshiro
tweak build script
2f07b2e
@pwittich @mcoshiro
Update setup_project.sh
1ae05b4
@mcoshiro
Manually copy EMP changes from emp_dual_* branches
17f5ec3
@mcoshiro
Some fixes to DualFPGA project generation after copy-merging
3fc1557
@mcoshiro
Some more compatibility changes
4b9fe8d
@mcoshiro
Many bug fixes, FPGA2 project now outputs tracks in simulation
b8d3dc4
@mcoshiro
Updates to make things work out-of-the-box
cf0b02a
@mcoshiro
First attempt at allowing simultaneous builds for both FPGAs
b77032c
@mcoshiro
Some fixes for FPGA1 build and integration
e2ee252
@mcoshiro
Fixes to control signals on EMP FPGA1 project
ee13502
@mcoshiro
Fix make rule for individual FPGA projects
5b7f03e
@mcoshiro
Manually copied FPGA2-targeted changes from dual_fpga2_4_ryd_validupd…
78fb43d 
…ates
aehart
aehart approved these changes Oct 29, 2024
View reviewed changes
Copy link
Contributor

@aehart aehart left a comment

Choose a reason for hiding this comment

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

This looks good to me, so I'll approve it.

I don't think there will be any merge conflicts between this PR and #342, but I do want to merge that one first just in case. Hopefully, that can happen today or tomorrow, then I will merge this one as well.

@aehart aehart merged commit d704970 into master Oct 30, 2024
1 check passed
@aehart aehart deleted the emp_fpga2 branch October 30, 2024 22:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aehart aehart aehart approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mcoshiro @aehart @pwittich