Merge branch 'L2SS-1268-add-cross-subband-weights' into 'master'

L2SS-1268: Add support for cross-polarisation subband weights

Closes L2SS-1268

See merge request !547

tangostationcontrol/tangostationcontrol/devices/sdp/sdp.py

@@ -88,6 +88,12 @@ class SDP(OPCUADevice):
         default_value=[[SUBBAND_UNIT_WEIGHT] * S_pn * N_subbands] * N_pn,
     )
 
+    FPGA_subband_weights_cross_RW_default = device_property(
+        dtype="DevVarULongArray",
+        mandatory=False,
+        default_value=[[0] * S_pn * N_subbands] * N_pn,
+    )
+
     clock_RW_default = device_property(
         dtype="DevULong", mandatory=False, default_value=CLK_200_MHZ
     )
@@ -277,6 +283,17 @@ class SDP(OPCUADevice):
         dims=(N_pn, S_pn, N_subbands),
         access=AttrWriteType.READ_WRITE,
     )
+    FPGA_subband_weights_cross_R = AttributeWrapper(
+        comms_annotation=["FPGA_subband_weights_cross_R"],
+        datatype=numpy.uint32,
+        dims=(N_pn, S_pn, N_subbands),
+    )
+    FPGA_subband_weights_cross_RW = AttributeWrapper(
+        comms_annotation=["FPGA_subband_weights_cross_RW"],
+        datatype=numpy.uint32,
+        dims=(N_pn, S_pn, N_subbands),
+        access=AttrWriteType.READ_WRITE,
+    )
     FPGA_time_since_last_pps_R = AttributeWrapper(
         comms_annotation=["FPGA_time_since_last_pps_R"],
         datatype=numpy.float_,