Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC TDC 1ns 5cha - Gateware
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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 TDC 1ns 5cha - Gateware
Commits
d56f09c3
Commit
d56f09c3
authored
May 24, 2019
by
Dimitris Lampridis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix direct timestamp mapping after latest changes
parent
b69e7d0c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
fmc_tdc_direct_readout.vhd
hdl/rtl/fmc_tdc_direct_readout.vhd
+3
-3
timestamp_convert_filter.vhd
hdl/rtl/timestamp_convert_filter.vhd
+7
-7
No files found.
hdl/rtl/fmc_tdc_direct_readout.vhd
View file @
d56f09c3
...
...
@@ -77,10 +77,10 @@ begin
ts_channel
<=
direct_timestamp_i
(
98
downto
96
);
ts_edge
<=
direct_timestamp_i
(
100
);
ts_seconds
<=
direct_timestamp_i
(
95
downto
64
);
ts_edge
<=
direct_timestamp_i
(
99
);
ts_seconds
<=
direct_timestamp_i
(
31
downto
0
);
ts_cycles
<=
direct_timestamp_i
(
63
downto
32
);
ts_bins
<=
direct_timestamp_i
(
17
downto
0
);
ts_bins
<=
direct_timestamp_i
(
81
downto
64
);
U_WB_Slave
:
fmc_tdc_direct_readout_wb_slave
port
map
(
...
...
hdl/rtl/timestamp_convert_filter.vhd
View file @
d56f09c3
...
...
@@ -197,14 +197,14 @@ architecture rtl of timestamp_convert_filter is
if
rst_sys_n_i
=
'0'
then
direct_timestamp_valid_o
<=
'0'
;
else
direct_timestamp_o
(
31
downto
0
)
<=
s3_ts
.
tai
;
direct_timestamp_o
(
63
downto
32
)
<=
s3_ts
.
coarse
;
direct_timestamp_o
(
95
downto
64
)
<=
x"00000"
&
s3_ts
.
frac
;
direct_timestamp_o
(
31
downto
0
)
<=
s3_ts
.
tai
;
direct_timestamp_o
(
63
downto
32
)
<=
s3_ts
.
coarse
;
direct_timestamp_o
(
95
downto
64
)
<=
x"00000"
&
s3_ts
.
frac
;
direct_timestamp_o
(
96
+
2
downto
96
)
<=
s3_ts
.
channel
;
direct_timestamp_o
(
96
+
3
)
<=
s3_ts
.
slope
;
direct_timestamp_o
(
127
downto
100
)
<=
(
others
=>
'0'
);
direct_timestamp_valid_o
<=
s3_valid
;
end
if
;
direct_timestamp_o
(
96
+
3
)
<=
s3_ts
.
slope
;
direct_timestamp_o
(
127
downto
100
)
<=
(
others
=>
'0'
);
direct_timestamp_valid_o
<=
s3_valid
;
end
if
;
end
if
;
end
process
;
...
...
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