Skip to content
Snippets Groups Projects
Commit 4ac0c7a1 authored by Jan David Mol's avatar Jan David Mol
Browse files

Merge branch 'set-antenna-band-field-indices' into 'master' 

Configure SDP's antenna band & field indices

See merge request !789
parents 7209bb95 889d0d5b
Branches
Tags
1 merge request!789Configure SDP's antenna band & field indices
Show whitespace changes
Inline Side-by-side
CDB/stations/cs001.json
+ 108
− 0
View file @ 4ac0c7a1
...@@ -1278,6 +1278,42 @@ ...@@ -1278,6 +1278,42 @@
"1", "1",
"1", "1",
"1" "1"
],
"FPGA_sdp_info_antenna_band_index_RW_default": [
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0"
],
"FPGA_sdp_info_antenna_field_index_RW_default": [
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0"
] ]
} }
}, },
...@@ -1300,6 +1336,42 @@ ...@@ -1300,6 +1336,42 @@
"1", "1",
"1", "1",
"1" "1"
],
"FPGA_sdp_info_antenna_band_index_RW_default": [
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1"
],
"FPGA_sdp_info_antenna_field_index_RW_default": [
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0",
"0"
] ]
} }
}, },
...@@ -1322,6 +1394,42 @@ ...@@ -1322,6 +1394,42 @@
"1", "1",
"1", "1",
"1" "1"
],
"FPGA_sdp_info_antenna_band_index_RW_default": [
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1"
],
"FPGA_sdp_info_antenna_field_index_RW_default": [
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1",
"1"
] ]
} }
} }
......
tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py
+ 4
− 0
View file @ 4ac0c7a1
...@@ -167,22 +167,26 @@ class SDP(OPCUADevice): ...@@ -167,22 +167,26 @@ class SDP(OPCUADevice):
access=AttrWriteType.READ_WRITE, access=AttrWriteType.READ_WRITE,
) )
FPGA_sdp_info_antenna_band_index_R = AttributeWrapper( FPGA_sdp_info_antenna_band_index_R = AttributeWrapper(
doc="Antenna band number to put in packet headers. 0=LB, 1=HB",
comms_annotation=["FPGA_sdp_info_antenna_band_index_R"], comms_annotation=["FPGA_sdp_info_antenna_band_index_R"],
datatype=numpy.uint32, datatype=numpy.uint32,
dims=(N_pn,), dims=(N_pn,),
) )
FPGA_sdp_info_antenna_band_index_RW = AttributeWrapper( FPGA_sdp_info_antenna_band_index_RW = AttributeWrapper(
doc="Antenna band number to put in packet headers. 0=LB, 1=HB",
comms_annotation=["FPGA_sdp_info_antenna_band_index_RW"], comms_annotation=["FPGA_sdp_info_antenna_band_index_RW"],
datatype=numpy.uint32, datatype=numpy.uint32,
dims=(N_pn,), dims=(N_pn,),
access=AttrWriteType.READ_WRITE, access=AttrWriteType.READ_WRITE,
) )
FPGA_sdp_info_antenna_field_index_R = AttributeWrapper( FPGA_sdp_info_antenna_field_index_R = AttributeWrapper(
doc="Antenna field number to put in packet headers. 0=LBA/HBA0/HBA, 1=HBA1",
comms_annotation=["FPGA_sdp_info_antenna_field_index_R"], comms_annotation=["FPGA_sdp_info_antenna_field_index_R"],
datatype=numpy.uint32, datatype=numpy.uint32,
dims=(N_pn,), dims=(N_pn,),
) )
FPGA_sdp_info_antenna_field_index_RW = AttributeWrapper( FPGA_sdp_info_antenna_field_index_RW = AttributeWrapper(
doc="Antenna field number to put in packet headers. 0=LBA/HBA0/HBA, 1=HBA1",
comms_annotation=["FPGA_sdp_info_antenna_field_index_RW"], comms_annotation=["FPGA_sdp_info_antenna_field_index_RW"],
datatype=numpy.uint32, datatype=numpy.uint32,
dims=(N_pn,), dims=(N_pn,),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment