Skip to content
GitLab
Explore
Sign in
Register
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
d893b0a9
Commit
d893b0a9
authored
Nov 22, 2021
by
Pieter Donker
Browse files
Options
Downloads
Plain Diff
Merge branch '
L2SDP-543
' into 'master'
mask can now only be set by user Closes
L2SDP-543
See merge request
!35
parents
72699a3b
60d1aa64
No related branches found
No related tags found
1 merge request
!35
mask can now only be set by user
Pipeline
#21128
passed
Nov 22, 2021
Stage: image
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/periph/fpga.cpp
+3
-5
3 additions, 5 deletions
src/periph/fpga.cpp
with
3 additions
and
5 deletions
src/periph/fpga.cpp
+
3
−
5
View file @
d893b0a9
...
@@ -61,7 +61,7 @@ extern int debug;
...
@@ -61,7 +61,7 @@ extern int debug;
Periph_fpga
::
Periph_fpga
(
uint
global_nr
,
string
ipaddr
,
uint
n_beamsets
)
:
Periph_fpga
::
Periph_fpga
(
uint
global_nr
,
string
ipaddr
,
uint
n_beamsets
)
:
GlobalNr
(
global_nr
),
GlobalNr
(
global_nr
),
nBeamsets
(
n_beamsets
),
nBeamsets
(
n_beamsets
),
Masked
(
fals
e
),
Masked
(
tru
e
),
Online
(
false
),
Online
(
false
),
my_current_design_name
(
"-"
),
my_current_design_name
(
"-"
),
my_current_hw_version
(
0
),
my_current_hw_version
(
0
),
...
@@ -137,7 +137,7 @@ bool Periph_fpga::read(TermOutput& termout, const string addr,
...
@@ -137,7 +137,7 @@ bool Periph_fpga::read(TermOutput& termout, const string addr,
return
false
;
return
false
;
}
}
if
(
!
Online
)
{
// Selected but not possible
if
(
!
Online
)
{
// Selected but not possible
cout
<<
"read() error node "
<<
GlobalNr
<<
" not
enabled or not
online"
<<
endl
;
cout
<<
"read() error node "
<<
GlobalNr
<<
" not online"
<<
endl
;
return
false
;
return
false
;
}
}
if
(
mmap
->
empty
())
{
if
(
mmap
->
empty
())
{
...
@@ -377,7 +377,7 @@ bool Periph_fpga::write(TermOutput& termout, const string addr, const string typ
...
@@ -377,7 +377,7 @@ bool Periph_fpga::write(TermOutput& termout, const string addr, const string typ
return
false
;
return
false
;
}
}
if
(
!
Online
)
{
// Selected but not possible
if
(
!
Online
)
{
// Selected but not possible
cout
<<
"write() error node "
<<
GlobalNr
<<
" not
enabled or not
online"
<<
endl
;
cout
<<
"write() error node "
<<
GlobalNr
<<
" not online"
<<
endl
;
return
false
;
return
false
;
}
}
if
(
mmap
->
empty
())
{
if
(
mmap
->
empty
())
{
...
@@ -748,7 +748,6 @@ bool Periph_fpga::read_system_info(TermOutput& termout)
...
@@ -748,7 +748,6 @@ bool Periph_fpga::read_system_info(TermOutput& termout)
}
}
cout
<<
"node "
<<
GlobalNr
<<
" no response"
<<
endl
;
cout
<<
"node "
<<
GlobalNr
<<
" no response"
<<
endl
;
Online
=
false
;
Online
=
false
;
Masked
=
false
;
mmap
->
clear
();
mmap
->
clear
();
return
false
;
return
false
;
}
}
...
@@ -761,7 +760,6 @@ bool Periph_fpga::read_system_info(TermOutput& termout)
...
@@ -761,7 +760,6 @@ bool Periph_fpga::read_system_info(TermOutput& termout)
cout
<<
"new mmap for node "
<<
GlobalNr
<<
endl
;
cout
<<
"new mmap for node "
<<
GlobalNr
<<
endl
;
mmap
->
print_screen
();
mmap
->
print_screen
();
Online
=
true
;
Online
=
true
;
Masked
=
true
;
my_current_design_name
=
read_design_name
();
my_current_design_name
=
read_design_name
();
cout
<<
"node "
<<
GlobalNr
<<
" now active design_name = "
<<
my_current_design_name
<<
endl
;
cout
<<
"node "
<<
GlobalNr
<<
" now active design_name = "
<<
my_current_design_name
<<
endl
;
}
}
...
...
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