Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
sdptr
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LOFAR2.0
sdptr
Commits
f1483fe7
Commit
f1483fe7
authored
Jul 22, 2021
by
Pieter Donker
Browse files
Options
Downloads
Patches
Plain Diff
L2SDP-365
, add jesd monitor points, working version.
parent
6cc4f4ae
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!14
L2 sdp 365
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/periph/fpga.cpp
+3
-3
3 additions, 3 deletions
src/periph/fpga.cpp
src/periph/fpga.h
+1
-1
1 addition, 1 deletion
src/periph/fpga.h
src/uniboard.conf
+4
-4
4 additions, 4 deletions
src/uniboard.conf
with
8 additions
and
8 deletions
src/periph/fpga.cpp
+
3
−
3
View file @
f1483fe7
...
...
@@ -68,7 +68,7 @@ Periph_fpga::Periph_fpga(string ipaddr, string expected_design_name, uint expect
my_current_fw_version
(
"-.-"
),
my_bsn_input_sync_timeout
(
false
),
my_bsn_input_bsn
(
0
),
my_bsn_input_nof_
block
s
(
0
),
my_bsn_input_nof_
packet
s
(
0
),
my_bsn_input_nof_valid
(
0
),
my_bsn_input_nof_err
(
0
),
my_jesd_csr_rbd_count
{
0
},
...
...
@@ -1561,7 +1561,7 @@ bool Periph_fpga::read_bsn_monitor_input_bsn(TermOutput& termout, int format, in
bool
Periph_fpga
::
read_bsn_monitor_input_nof_packets
(
TermOutput
&
termout
,
int
format
,
int
mode
)
{
bool
retval
=
true
;
int32_t
nof_blocks
=
my_bsn_input_nof_
block
s
;
int32_t
nof_blocks
=
my_bsn_input_nof_
packet
s
;
if
(
mode
==
R_UCP
)
{
if
(
my_bsn_input_sync_timeout
==
true
)
{
nof_blocks
=
-
1
;
...
...
@@ -1578,7 +1578,7 @@ bool Periph_fpga::read_bsn_monitor_input_nof_packets(TermOutput& termout, int fo
*
_ptr
=
nof_blocks
;
termout
.
nof_vals
=
1
;
termout
.
datatype
=
format
;
my_bsn_input_nof_
block
s
=
nof_blocks
;
my_bsn_input_nof_
packet
s
=
nof_blocks
;
return
retval
;
}
...
...
This diff is collapsed.
Click to expand it.
src/periph/fpga.h
+
1
−
1
View file @
f1483fe7
...
...
@@ -58,7 +58,7 @@ private:
bool
my_bsn_input_sync_timeout
;
int64_t
my_bsn_input_bsn
;
int32_t
my_bsn_input_nof_
block
s
;
int32_t
my_bsn_input_nof_
packet
s
;
int32_t
my_bsn_input_nof_valid
;
int32_t
my_bsn_input_nof_err
;
...
...
This diff is collapsed.
Click to expand it.
src/uniboard.conf
+
4
−
4
View file @
f1483fe7
...
...
@@ -5,10 +5,10 @@
# gn ipaddr expected firmware expected version enabled
# UNB 0
node
0
10
.
99
.
2
.
1
lofar2_unb2b_sdp_station_
f
sub
2
1
node
1
10
.
99
.
2
.
2
lofar2_unb2b_sdp_station_
f
sub
2
1
node
2
10
.
99
.
2
.
3
lofar2_unb2b_sdp_station_
f
sub
2
1
node
3
10
.
99
.
2
.
4
lofar2_unb2b_sdp_station_
f
sub
2
0
node
0
10
.
99
.
2
.
1
lofar2_unb2b_sdp_station_
x
sub
_one
2
1
node
1
10
.
99
.
2
.
2
lofar2_unb2b_sdp_station_
x
sub
_one
2
1
node
2
10
.
99
.
2
.
3
lofar2_unb2b_sdp_station_
x
sub
_one
2
1
node
3
10
.
99
.
2
.
4
lofar2_unb2b_sdp_station_
x
sub
_one
2
1
# UNB 1
node
4
10
.
99
.
2
.
5
unb2b_minimal
2
0
...
...
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