From cc3a458172be2a3277a0137e8c2f3753e83e0be1 Mon Sep 17 00:00:00 2001 From: Jan David Mol <mol@astron.nl> Date: Fri, 7 May 2021 11:04:04 +0200 Subject: [PATCH] L2SS-202: Added second round of SST SDP datapoints --- devices/SDP.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/devices/SDP.py b/devices/SDP.py index 7db55b341..6df8dec72 100644 --- a/devices/SDP.py +++ b/devices/SDP.py @@ -64,6 +64,8 @@ class SDP(hardware_device): # ---------- # Attributes # ---------- + # 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=["1:tr_fpga_mask_RW"], datatype=numpy.bool_, dims=(16,), access=AttrWriteType.READ_WRITE) fpga_mask_RW = attribute_wrapper(comms_annotation=["1:fpga_mask_RW"], datatype=numpy.bool_, dims=(16,), access=AttrWriteType.READ_WRITE) fpga_scrap_R = attribute_wrapper(comms_annotation=["1:fpga_scrap_R"], datatype=numpy.int32, dims=(2048,)) fpga_scrap_RW = attribute_wrapper(comms_annotation=["1:fpga_scrap_RW"], datatype=numpy.int32, dims=(2048,), access=AttrWriteType.READ_WRITE) @@ -86,8 +88,10 @@ class SDP(hardware_device): fpga_sdp_info_station_id_R = attribute_wrapper(comms_annotation=["1:fpga_sdp_info_station_id_R"], datatype=numpy.uint16, dims=(16,)) fpga_sdp_info_observation_id_RW = attribute_wrapper(comms_annotation=["1:fpga_sdp_info_observation_id_RW"], datatype=numpy.uint32, dims=(16,), access=AttrWriteType.READ_WRITE) fpga_sdp_info_observation_id_R = attribute_wrapper(comms_annotation=["1:fpga_sdp_info_observation_id_R"], datatype=numpy.uint32, dims=(16,)) - fpga_sdp_info_source_id_RW = attribute_wrapper(comms_annotation=["1:fpga_sdp_info_source_id_RW"], datatype=numpy.uint16, dims=(16,), access=AttrWriteType.READ_WRITE) - fpga_sdp_info_source_id_R = attribute_wrapper(comms_annotation=["1:fpga_sdp_info_source_id_R"], datatype=numpy.uint16, dims=(16,)) + fpga_sdp_info_nyquist_sampling_zone_index_RW = attribute_wrapper(comms_annotation=["1:fpga_sdp_info_nyquist_sampling_zone_index_RW"], datatype=numpy.uint16, dims=(16,), access=AttrWriteType.READ_WRITE) + fpga_sdp_info_nyquist_sampling_zone_index_R = attribute_wrapper(comms_annotation=["1:fpga_sdp_info_nyquist_sampling_zone_index_R"], datatype=numpy.uint16, dims=(16,)) + fpga_sdp_info_subband_calibrated_flag_R = attribute_wrapper(comms_annotation=["1:fpga_sdp_info_subband_calibrated_flag_R"], datatype=numpy.uint16, dims=(16,)) + fpga_sdp_info_beamlet_scale_R = attribute_wrapper(comms_annotation=["1:fpga_sdp_info_beamlet_scale_R"], datatype=numpy.uint16, dims=(16,)) tr_busy_R = attribute_wrapper(comms_annotation=["1:tr_busy_R"], datatype=numpy.bool_) # NOTE: typo in node name is 'tr_reload_W' should be 'tr_reload_RW' -- GitLab