Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
E
euro-adc-65m-14b-40cha-gw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
eurocard
euro-adc-65m-14b-40cha
euro-adc-65m-14b-40cha-gw
Commits
2b5956fa
Commit
2b5956fa
authored
Jun 08, 2017
by
Dave Newbold
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing trigger acknowledge bug
parent
8dd99bc2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
sc_seq.vhd
components/solid/firmware/hdl/sc_seq.vhd
+2
-2
sc_trig_gen_or.vhd
components/solid/firmware/hdl/sc_trig_gen_or.vhd
+1
-1
sc_trig_gen_random.vhd
components/solid/firmware/hdl/sc_trig_gen_random.vhd
+1
-1
No files found.
components/solid/firmware/hdl/sc_seq.vhd
View file @
2b5956fa
...
...
@@ -80,8 +80,8 @@ begin
td
<=
d_loc
when
valid_loc
=
'1'
else
d_ext
;
tv
<=
valid_loc
or
valid_ext
;
ack_loc
<=
valid_loc
when
rising_edge
(
clk40
)
;
ack_ext
<=
valid_ext
and
not
valid_loc
when
rising_edge
(
clk40
)
;
ack_loc
<=
valid_loc
;
ack_ext
<=
valid_ext
and
not
valid_loc
;
process
(
clk40
)
begin
...
...
components/solid/firmware/hdl/sc_trig_gen_or.vhd
View file @
2b5956fa
...
...
@@ -41,6 +41,6 @@ begin
mark_del
<=
mark_del
(
DELAY
-
2
downto
0
)
&
mark
when
rising_edge
(
clk
);
v
<=
((
v
and
not
mark_del
(
DELAY
-
1
))
or
(
or_reduce
(
chan_trig
(
TBIT
))
and
mark_del
(
DELAY
-
1
)))
and
not
(
ack
or
not
en
)
when
rising_edge
(
clk
);
valid
<=
v
and
not
ack
;
valid
<=
v
;
end
rtl
;
components/solid/firmware/hdl/sc_trig_gen_random.vhd
View file @
2b5956fa
...
...
@@ -56,6 +56,6 @@ begin
(
mode
(
0
)
and
not
or_reduce
(
sctr
(
BLK_RADIX
+
mask
'left
downto
BLK_RADIX
)
and
mask
)))
and
mode
(
1
);
v
<=
((
v
and
not
mark
)
or
((
rtrig
or
force_c
)
and
mark
))
and
not
(
ack
or
not
en
)
when
rising_edge
(
clk
);
valid
<=
v
and
not
ack
;
valid
<=
v
;
end
rtl
;
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