Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

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

Snippets Groups Projects

41a0b703

Commit 41a0b703 authored 1 year ago by David Gabriel Monk

Downloads
- Plain Diff

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

# Conflicts:
#   common/firmware/cfg/module.dep

parents 00da54eb 4dd40b0f

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 11
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

common/addr_table/mprocessor.xml 8 additions, 3 deletions

common/addr_table/mprocessor.xml
common/firmware/cfg/module.dep 1 addition, 0 deletions

common/firmware/cfg/module.dep
common/firmware/hdl/LinkAggregatorCore.vhd 3 additions, 2 deletions

common/firmware/hdl/LinkAggregatorCore.vhd
common/firmware/hdl/LinkAggregatorIPBus.vhd 4 additions, 2 deletions

common/firmware/hdl/LinkAggregatorIPBus.vhd
common/firmware/hdl/LinkCombinerCore.vhd 22 additions, 70 deletions

common/firmware/hdl/LinkCombinerCore.vhd
common/firmware/hdl/LinkCombinerIPBus.vhd 6 additions, 6 deletions

common/firmware/hdl/LinkCombinerIPBus.vhd
common/firmware/hdl/MProcessor.vhd 66 additions, 10 deletions

common/firmware/hdl/MProcessor.vhd
common/firmware/hdl/PayloadHeaderGenerator.vhd 109 additions, 0 deletions

common/firmware/hdl/PayloadHeaderGenerator.vhd
common/firmware/hdl/mprocessor_constants.vhd 1 addition, 0 deletions

common/firmware/hdl/mprocessor_constants.vhd
top/addr_table/emp_payload.xml 10 additions, 8 deletions

top/addr_table/emp_payload.xml
top/firmware/hdl/emp_payload.vhd 32 additions, 11 deletions

top/firmware/hdl/emp_payload.vhd

with 262 additions and 112 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