Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

MUonE Processor
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

85a2b483

Commit 85a2b483 authored 1 year ago by David Gabriel Monk

Downloads
- Plain Diff

Merge branch 'heterogeneous-dtc' into 'configurable-thresholds'

# Conflicts:
#   common/firmware/hdl/LinkAggregatorCore.vhd

parents 10a2a2c8 2312af03

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 5
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

common/firmware/hdl/LinkAggregatorCore.vhd 28 additions, 27 deletions

common/firmware/hdl/LinkAggregatorCore.vhd
top/addr_table/emp_payload.xml 3 additions, 2 deletions

top/addr_table/emp_payload.xml
top/firmware/hdl/emp_payload.vhd 24 additions, 15 deletions

top/firmware/hdl/emp_payload.vhd
top/firmware/hdl/emp_project_decl.vhd 34 additions, 13 deletions

top/firmware/hdl/emp_project_decl.vhd
top/firmware/hdl/link_maps.vhd 15 additions, 9 deletions

top/firmware/hdl/link_maps.vhd

with 104 additions and 66 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