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

Merge branch 'fix-types' into 'master'

Fix datatype of FPGA_scrap and several EC OPC/UA points.

See merge request !1006
parents ad39996c 8e890115
No related branches found
No related tags found
1 merge request!1006Fix datatype of FPGA_scrap and several EC OPC/UA points.
......@@ -37,16 +37,16 @@ class EC(OPCUADevice):
# ----------
Temperature_Cab0_0_R = AttributeWrapper(
comms_annotation=["Temperature_Cab0.0_R"], datatype=numpy.float32
comms_annotation=["Temperature_Cab0.0_R"], datatype=numpy.float64
)
Temperature_Cab0_1_R = AttributeWrapper(
comms_annotation=["Temperature_Cab0.1_R"], datatype=numpy.float32
comms_annotation=["Temperature_Cab0.1_R"], datatype=numpy.float64
)
Temperature_Cab1_0_R = AttributeWrapper(
comms_annotation=["Temperature_Cab1.0_R"], datatype=numpy.float32
comms_annotation=["Temperature_Cab1.0_R"], datatype=numpy.float64
)
Temperature_Cab1_1_R = AttributeWrapper(
comms_annotation=["Temperature_Cab1.1_R"], datatype=numpy.float32
comms_annotation=["Temperature_Cab1.1_R"], datatype=numpy.float64
)
Door_Closed_Cab0_0_R = AttributeWrapper(
comms_annotation=["Door_Closed_Cab0.0_R"], datatype=bool
......@@ -80,29 +80,29 @@ class EC(OPCUADevice):
)
Setpoint_Temperature_PID_RW = AttributeWrapper(
comms_annotation=["Setpoint_Temperature_PID_RW"],
datatype=numpy.float32,
datatype=numpy.float64,
access=AttrWriteType.READ_WRITE,
)
Fan_Speed_Door_Closed_RW = AttributeWrapper(
comms_annotation=["Fan_Speed_Door_Open_RW"], datatype=numpy.float32
comms_annotation=["Fan_Speed_Door_Open_RW"], datatype=numpy.float64
)
First_Trip_Temperature_RW = AttributeWrapper(
comms_annotation=["First_Trip_Temperature_RW"],
datatype=numpy.float32,
datatype=numpy.float64,
access=AttrWriteType.READ_WRITE,
)
Second_Trip_Temperature_RW = AttributeWrapper(
comms_annotation=["Second_Trip_Temperature_RW"],
datatype=numpy.float32,
datatype=numpy.float64,
access=AttrWriteType.READ_WRITE,
)
InnerFans_Cab0_RPM_RW = AttributeWrapper(
comms_annotation=["InnerFans_Cab0_RPM_RW"],
datatype=numpy.float32,
datatype=numpy.float64,
access=AttrWriteType.READ_WRITE,
)
InnerFans_Cab0_RPM_R = AttributeWrapper(
comms_annotation=["InnerFans_Cab0_RPM_R"], datatype=numpy.float32
comms_annotation=["InnerFans_Cab0_RPM_R"], datatype=numpy.float64
)
# ----------
......
......@@ -175,13 +175,13 @@ class SDPFirmware(OPCUADevice):
FPGA_scrap_R = AttributeWrapper(
comms_annotation=["FPGA_scrap_R"],
datatype=numpy.int32,
datatype=numpy.uint32,
dims=(N_pn, N_subbands),
doc="FPGA scratch memory",
)
FPGA_scrap_RW = AttributeWrapper(
comms_annotation=["FPGA_scrap_RW"],
datatype=numpy.int32,
datatype=numpy.uint32,
dims=(N_pn, N_subbands),
access=AttrWriteType.READ_WRITE,
doc="FPGA scratch memory",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment