Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
Beam Positoning Monitor - Gateware
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Beam Positoning Monitor - Gateware
Commits
349c211e
Commit
349c211e
authored
Oct 03, 2018
by
Lucas Russo
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'phase-sync-trig' into devel
parents
ea193f70
9f10a102
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
2 deletions
+15
-2
dsp-cores
hdl/ip_cores/dsp-cores
+1
-1
dbe_bpm_gen.vhd
hdl/top/afc_v3/vivado/dbe_bpm_gen/dbe_bpm_gen.vhd
+14
-1
No files found.
dsp-cores
@
f1bb430e
Subproject commit f
f87c658c5a9858ea496fb208e231f71bbb2e9fe
Subproject commit f
1bb430e7f14dd6e5b823b8dbe218b6477c62f20
hdl/top/afc_v3/vivado/dbe_bpm_gen/dbe_bpm_gen.vhd
View file @
349c211e
...
...
@@ -706,8 +706,9 @@ architecture rtl of dbe_bpm_gen is
constant
c_acq_monit_amp_id
:
natural
:
=
16
;
constant
c_acq_monit_pos_id
:
natural
:
=
17
;
constant
c_trigger_sw_clk_id
:
natural
:
=
18
;
constant
c_phase_sync_trigger_id
:
natural
:
=
19
;
constant
c_trig_num_channels
:
natural
:
=
1
;
constant
c_trig_num_channels
:
natural
:
=
2
;
-- Number of channels per acquisition core
constant
c_acq_num_channels
:
natural
:
=
18
;
-- ADC + ADC SWAP + MIXER + TBT AMP + TBT POS +
-- FOFB AMP + FOFB POS + MONIT AMP + MONIT POS + MONIT1 AMP +
...
...
@@ -2995,6 +2996,12 @@ begin
-----------------------------
rffe_swclk_o
=>
dsp1_clk_rffe_swap
,
-----------------------------
-- Synchronization trigger for RFFE swap clock
-----------------------------
sync_trig_i
=>
trig_pulse_rcv
(
c_trig_mux_0_id
,
c_phase_sync_trigger_id
)
.
pulse
,
-----------------------------
-- Debug signals
-----------------------------
...
...
@@ -3213,6 +3220,12 @@ begin
-----------------------------
rffe_swclk_o
=>
dsp2_clk_rffe_swap
,
-----------------------------
-- Synchronization trigger for RFFE swap clock
-----------------------------
sync_trig_i
=>
trig_pulse_rcv
(
c_trig_mux_1_id
,
c_phase_sync_trigger_id
)
.
pulse
,
-----------------------------
-- Debug signals
-----------------------------
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment