Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC ADC 100M 14b 4cha - Gateware
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
8
Issues
8
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
FMC ADC 100M 14b 4cha - Gateware
Commits
1e0e561f
Commit
1e0e561f
authored
Jun 07, 2019
by
Dimitris Lampridis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hdl: do not wait until the acq is done to send the alt trigger out
parent
053bd549
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
11 deletions
+12
-11
fmc_adc_100Ms_core.vhd
hdl/rtl/fmc_adc_100Ms_core.vhd
+12
-11
No files found.
hdl/rtl/fmc_adc_100Ms_core.vhd
View file @
1e0e561f
...
...
@@ -262,6 +262,7 @@ architecture rtl of fmc_adc_100Ms_core is
signal
acq_start
:
std_logic
;
signal
acq_stop
:
std_logic
;
signal
acq_trig
:
std_logic
;
signal
acq_trig_d
:
std_logic
;
signal
acq_end
:
std_logic
;
signal
acq_end_d
:
std_logic
;
signal
acq_in_pre_trig
:
std_logic
;
...
...
@@ -989,12 +990,8 @@ begin
p_acq_end
:
process
(
sys_clk_i
)
begin
if
rising_edge
(
sys_clk_i
)
then
if
sys_rst_n_i
=
'0'
then
acq_end_d
<=
'0'
;
else
acq_end_d
<=
acq_end
;
end
if
;
end
if
;
end
process
p_acq_end
;
acq_end_p_o
<=
acq_end
and
not
(
acq_end_d
);
...
...
@@ -1194,12 +1191,8 @@ begin
p_trig_tag_done
:
process
(
sys_clk_i
)
begin
if
rising_edge
(
sys_clk_i
)
then
if
sys_rst_n_i
=
'0'
then
acq_in_trig_tag_d
<=
'0'
;
else
acq_in_trig_tag_d
<=
acq_in_trig_tag
;
end
if
;
end
if
;
end
process
p_trig_tag_done
;
trig_tag_done
<=
acq_in_trig_tag
and
acq_in_trig_tag_d
;
...
...
@@ -1533,7 +1526,15 @@ begin
trigout_trig
<=
f_reduce_or
(
trigout_triggers
and
trigout_en
);
trigout_fifo_wr
<=
trigout_trig
and
not
trigout_fifo_full
and
trig_tag_done
;
-- Acquisition trigger delayed pulse
p_acq_end
:
process
(
sys_clk_i
)
begin
if
rising_edge
(
sys_clk_i
)
then
acq_trig_d
<=
acq_trig
;
end
if
;
end
process
p_acq_end
;
trigout_fifo_wr
<=
trigout_trig
and
not
trigout_fifo_full
and
acq_trig_d
;
cmp_trigout_fifo
:
generic_sync_fifo
generic
map
(
...
...
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