Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
tango
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira issues
Open 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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LOFAR2.0
tango
Commits
7109f83d
Commit
7109f83d
authored
3 years ago
by
Jan David Mol
Browse files
Options
Downloads
Patches
Plain Diff
L2SS-176
: Add version monitoring point to our devices
parent
1a556d96
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!35
Resolve L2SS-176 "Expose git version"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
devices/APSCTL.py
+5
-1
5 additions, 1 deletion
devices/APSCTL.py
devices/PCC.py
+5
-1
5 additions, 1 deletion
devices/PCC.py
devices/SDP.py
+5
-1
5 additions, 1 deletion
devices/SDP.py
with
15 additions
and
3 deletions
devices/APSCTL.py
+
5
−
1
View file @
7109f83d
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
# PyTango imports
# PyTango imports
from
tango.server
import
run
from
tango.server
import
run
from
tango.server
import
device_property
from
tango.server
import
device_property
,
attribute
from
tango
import
AttrWriteType
from
tango
import
AttrWriteType
# Additional import
# Additional import
...
@@ -22,6 +22,7 @@ from util.attribute_wrapper import attribute_wrapper
...
@@ -22,6 +22,7 @@ from util.attribute_wrapper import attribute_wrapper
from
util.hardware_device
import
hardware_device
from
util.hardware_device
import
hardware_device
from
util.lofar_logging
import
device_logging_to_python
,
log_exceptions
from
util.lofar_logging
import
device_logging_to_python
,
log_exceptions
from
util.lofar_git
import
get_version
import
numpy
import
numpy
...
@@ -64,6 +65,9 @@ class APSCTL(hardware_device):
...
@@ -64,6 +65,9 @@ class APSCTL(hardware_device):
# ----------
# ----------
# Attributes
# Attributes
# ----------
# ----------
version
=
attribute
(
dtype
=
str
,
access
=
AttrWriteType
.
READ
,
fget
=
lambda
self
:
get_version
())
N_unb
=
2
N_unb
=
2
N_fpga
=
4
N_fpga
=
4
N_ddr
=
2
N_ddr
=
2
...
...
This diff is collapsed.
Click to expand it.
devices/PCC.py
+
5
−
1
View file @
7109f83d
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
# PyTango imports
# PyTango imports
from
tango
import
DebugIt
from
tango
import
DebugIt
from
tango.server
import
run
,
command
from
tango.server
import
run
,
command
from
tango.server
import
device_property
from
tango.server
import
device_property
,
attribute
from
tango
import
AttrWriteType
from
tango
import
AttrWriteType
import
numpy
import
numpy
# Additional import
# Additional import
...
@@ -25,6 +25,7 @@ from clients.opcua_connection import OPCUAConnection
...
@@ -25,6 +25,7 @@ from clients.opcua_connection import OPCUAConnection
from
util.attribute_wrapper
import
attribute_wrapper
from
util.attribute_wrapper
import
attribute_wrapper
from
util.hardware_device
import
hardware_device
from
util.hardware_device
import
hardware_device
from
util.lofar_logging
import
device_logging_to_python
,
log_exceptions
from
util.lofar_logging
import
device_logging_to_python
,
log_exceptions
from
util.lofar_git
import
get_version
__all__
=
[
"
PCC
"
,
"
main
"
]
__all__
=
[
"
PCC
"
,
"
main
"
]
...
@@ -69,6 +70,9 @@ class PCC(hardware_device):
...
@@ -69,6 +70,9 @@ class PCC(hardware_device):
# ----------
# ----------
# Attributes
# Attributes
# ----------
# ----------
version
=
attribute
(
dtype
=
str
,
access
=
AttrWriteType
.
READ
,
fget
=
lambda
self
:
get_version
())
RCU_mask_RW
=
attribute_wrapper
(
comms_annotation
=
[
"
2:PCC
"
,
"
2:RCU_mask_RW
"
],
datatype
=
numpy
.
bool_
,
dims
=
(
32
,),
access
=
AttrWriteType
.
READ_WRITE
)
RCU_mask_RW
=
attribute_wrapper
(
comms_annotation
=
[
"
2:PCC
"
,
"
2:RCU_mask_RW
"
],
datatype
=
numpy
.
bool_
,
dims
=
(
32
,),
access
=
AttrWriteType
.
READ_WRITE
)
Ant_mask_RW
=
attribute_wrapper
(
comms_annotation
=
[
"
2:PCC
"
,
"
2:Ant_mask_RW
"
],
datatype
=
numpy
.
bool_
,
dims
=
(
3
,
32
),
access
=
AttrWriteType
.
READ_WRITE
)
Ant_mask_RW
=
attribute_wrapper
(
comms_annotation
=
[
"
2:PCC
"
,
"
2:Ant_mask_RW
"
],
datatype
=
numpy
.
bool_
,
dims
=
(
3
,
32
),
access
=
AttrWriteType
.
READ_WRITE
)
RCU_attenuator_R
=
attribute_wrapper
(
comms_annotation
=
[
"
2:PCC
"
,
"
2:RCU_attenuator_R
"
],
datatype
=
numpy
.
int64
,
dims
=
(
3
,
32
))
RCU_attenuator_R
=
attribute_wrapper
(
comms_annotation
=
[
"
2:PCC
"
,
"
2:RCU_attenuator_R
"
],
datatype
=
numpy
.
int64
,
dims
=
(
3
,
32
))
...
...
This diff is collapsed.
Click to expand it.
devices/SDP.py
+
5
−
1
View file @
7109f83d
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
# PyTango imports
# PyTango imports
from
tango.server
import
run
from
tango.server
import
run
from
tango.server
import
device_property
from
tango.server
import
device_property
,
attribute
from
tango
import
AttrWriteType
from
tango
import
AttrWriteType
# Additional import
# Additional import
...
@@ -22,6 +22,7 @@ from util.attribute_wrapper import attribute_wrapper
...
@@ -22,6 +22,7 @@ from util.attribute_wrapper import attribute_wrapper
from
util.hardware_device
import
hardware_device
from
util.hardware_device
import
hardware_device
from
util.lofar_logging
import
device_logging_to_python
,
log_exceptions
from
util.lofar_logging
import
device_logging_to_python
,
log_exceptions
from
util.lofar_git
import
get_version
import
numpy
import
numpy
...
@@ -64,6 +65,9 @@ class SDP(hardware_device):
...
@@ -64,6 +65,9 @@ class SDP(hardware_device):
# ----------
# ----------
# Attributes
# Attributes
# ----------
# ----------
version
=
attribute
(
dtype
=
str
,
access
=
AttrWriteType
.
READ
,
fget
=
lambda
self
:
get_version
())
# SDP will switch from fpga_mask_RW to tr_fpga_mask_RW, offer both for now as its a critical flag
# SDP will switch from fpga_mask_RW to tr_fpga_mask_RW, offer both for now as its a critical flag
tr_fpga_mask_RW
=
attribute_wrapper
(
comms_annotation
=
[
"
2:tr_fpga_mask_RW
"
],
datatype
=
numpy
.
bool_
,
dims
=
(
16
,),
access
=
AttrWriteType
.
READ_WRITE
)
tr_fpga_mask_RW
=
attribute_wrapper
(
comms_annotation
=
[
"
2:tr_fpga_mask_RW
"
],
datatype
=
numpy
.
bool_
,
dims
=
(
16
,),
access
=
AttrWriteType
.
READ_WRITE
)
fpga_mask_RW
=
attribute_wrapper
(
comms_annotation
=
[
"
2:fpga_mask_RW
"
],
datatype
=
numpy
.
bool_
,
dims
=
(
16
,),
access
=
AttrWriteType
.
READ_WRITE
)
fpga_mask_RW
=
attribute_wrapper
(
comms_annotation
=
[
"
2:fpga_mask_RW
"
],
datatype
=
numpy
.
bool_
,
dims
=
(
16
,),
access
=
AttrWriteType
.
READ_WRITE
)
...
...
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