Merge branch 'FLX-2355' into 'phase2/master' (d753baa3) · Commits · atlas-tdaq-felix / firmware · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

firmware
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Jira
- Environments
- Incidents

Snippets Groups Projects

d753baa3

Commit d753baa3 authored 8 months ago by Frans Schreuder

Downloads
- Plain Diff

Merge branch 'FLX-2355' into 'phase2/master'

Resolve FLX-2355

Closes FLX-2355

See merge request !552

parents cb2ad9fd cfb40e40

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 14
Pipelines 1

Expand all Hide whitespace changes

Inline Side-by-side

Showing

constraints/felix_top_BNL712.xdc 99 additions, 99 deletions

constraints/felix_top_BNL712.xdc
simulation/ItkStrip/tb_l0a_frame_generator.vhd 181 additions, 111 deletions

simulation/ItkStrip/tb_l0a_frame_generator.vhd
simulation/ItkStrip/tb_lcb_axi_encoder.vhd 171 additions, 100 deletions

simulation/ItkStrip/tb_lcb_axi_encoder.vhd
simulation/ItkStrip/tb_r3l1_axi_encoder.vhd 5 additions, 4 deletions

simulation/ItkStrip/tb_r3l1_axi_encoder.vhd
sources/ItkStrip/l0a_frame_generator.vhd 155 additions, 124 deletions

sources/ItkStrip/l0a_frame_generator.vhd
sources/ItkStrip/lcb_axi_encoder.vhd 4 additions, 0 deletions

sources/ItkStrip/lcb_axi_encoder.vhd
sources/ItkStrip/lcb_wrapper.vhd 9 additions, 5 deletions

sources/ItkStrip/lcb_wrapper.vhd
sources/ItkStrip/r3l1_axi_encoder.vhd 4 additions, 3 deletions

sources/ItkStrip/r3l1_axi_encoder.vhd
sources/ItkStrip/r3l1_wrapper.vhd 2 additions, 2 deletions

sources/ItkStrip/r3l1_wrapper.vhd
sources/LpGBT/LpGBT_FELIX/FELIX_LpGBT_Wrapper.vhd 10 additions, 1 deletion

sources/LpGBT/LpGBT_FELIX/FELIX_LpGBT_Wrapper.vhd
sources/encoding/encoding.vhd 7 additions, 4 deletions

sources/encoding/encoding.vhd
sources/ttc/itk_trigtag_generator.vhd 102 additions, 51 deletions

sources/ttc/itk_trigtag_generator.vhd
sources/ttc/ltittc_wrapper/ltittc_wrapper.vhd 2 additions, 2 deletions

sources/ttc/ltittc_wrapper/ltittc_wrapper.vhd
sources/ttc/ttc_decoder/ttc_fmc_wrapper_xilinx.vhd 3 additions, 4 deletions

sources/ttc/ttc_decoder/ttc_fmc_wrapper_xilinx.vhd

with 754 additions and 510 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment