Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
module_test_fw
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CMS ETL Electronics
module_test_fw
Commits
aa33a3a8
There was an error fetching the commit references. Please try again later.
Commit
aa33a3a8
authored
1 year ago
by
Andrew Peck
Browse files
Options
Downloads
Patches
Plain Diff
connect global qinj to etrocs
parent
e7a23415
No related branches found
No related tags found
1 merge request
!63
Switchable FEC mode
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/readout_board/etl_test_fw.vhd
+5
-3
5 additions, 3 deletions
src/readout_board/etl_test_fw.vhd
src/readout_board/readout_board.vhd
+4
-3
4 additions, 3 deletions
src/readout_board/readout_board.vhd
with
9 additions
and
6 deletions
src/readout_board/etl_test_fw.vhd
+
5
−
3
View file @
aa33a3a8
...
...
@@ -179,7 +179,7 @@ architecture behavioral of etl_test_fw is
-- TTC
--------------------------------------------------------------------------------
signal
bc0
,
l1a
:
std_logic
;
signal
bc0
,
l1a
,
qinj
:
std_logic
;
signal
ext_trigger
:
std_logic
;
signal
trigger_o
:
std_logic_vector
(
NUM_RBS
-1
downto
0
);
signal
l1a_rate_cnt
:
std_logic_vector
(
31
downto
0
);
...
...
@@ -612,6 +612,7 @@ begin
reset
=>
reset
,
l1a
=>
l1a
,
bc0
=>
bc0
,
qinj
=>
qinj
,
force_trig
=>
system_ctrl
.
l1a_pulse
,
ext_trig
=>
ext_trigger
,
ext_trig_en
=>
system_ctrl
.
en_ext_trigger
,
...
...
@@ -660,8 +661,9 @@ begin
reset
=>
reset
,
-- ttc
bc0
=>
bc0
,
l1a
=>
l1a
,
bc0
=>
bc0
,
l1a
=>
l1a
,
qinj
=>
qinj
,
-- DAQ wishbone
daq_wb_in
=>
daq_ipb_w_array
(
I
downto
I
),
...
...
This diff is collapsed.
Click to expand it.
src/readout_board/readout_board.vhd
+
4
−
3
View file @
aa33a3a8
...
...
@@ -39,8 +39,9 @@ entity readout_board is
strobe
:
in
std_logic
;
bc0
:
in
std_logic
;
l1a
:
in
std_logic
;
bc0
:
in
std_logic
;
qinj
:
in
std_logic
;
l1a
:
in
std_logic
;
mon
:
out
READOUT_BOARD_MON_t
;
ctrl
:
in
READOUT_BOARD_CTRL_t
;
...
...
@@ -283,9 +284,9 @@ begin
reset
=>
reset
,
l1a_i
=>
l1a
or
ctrl
.
l1a_pulse
,
bc0
=>
bc0
or
ctrl
.
bc0_pulse
,
qinj
=>
qinj
or
ctrl
.
qinj_pulse
,
ecr
=>
ctrl
.
ecr_pulse
,
link_reset
=>
ctrl
.
link_reset_pulse
,
qinj
=>
ctrl
.
qinj_pulse
,
l1a_qinj
=>
ctrl
.
l1a_qinj_pulse
,
l1a_inj_dly
=>
ctrl
.
l1a_inj_dly
,
ws_stop
=>
ctrl
.
ws_stop_pulse
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment