w
This commit is contained in:
@@ -103,6 +103,7 @@ class GalilRIO(PSIDeviceBase):
|
||||
|
||||
SUB_CONNECTION_CHANGE = "connection_change"
|
||||
|
||||
an_ch0 = Cpt(GalilRIOSignalRO, signal_name="an_ch0", channel=0, doc="Analog input channel 0")
|
||||
an_ch1 = Cpt(GalilRIOSignalRO, signal_name="an_ch1", channel=1, doc="Analog input channel 1")
|
||||
an_ch2 = Cpt(GalilRIOSignalRO, signal_name="an_ch2", channel=2, doc="Analog input channel 2")
|
||||
an_ch3 = Cpt(GalilRIOSignalRO, signal_name="an_ch3", channel=3, doc="Analog input channel 3")
|
||||
@@ -110,7 +111,6 @@ class GalilRIO(PSIDeviceBase):
|
||||
an_ch5 = Cpt(GalilRIOSignalRO, signal_name="an_ch5", channel=5, doc="Analog input channel 5")
|
||||
an_ch6 = Cpt(GalilRIOSignalRO, signal_name="an_ch6", channel=6, doc="Analog input channel 6")
|
||||
an_ch7 = Cpt(GalilRIOSignalRO, signal_name="an_ch7", channel=7, doc="Analog input channel 7")
|
||||
an_ch8 = Cpt(GalilRIOSignalRO, signal_name="an_ch8", channel=8, doc="Analog input channel 8")
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
@@ -163,7 +163,7 @@ class GalilRIO(PSIDeviceBase):
|
||||
logger.info(f"Reading Galil RIO channels with command: {cmd}")
|
||||
ret = self.controller.socket_put_and_receive(cmd)
|
||||
timestamp = time.time()
|
||||
values = [float(val) for val in ret.strip().strip("?").split(" ")]
|
||||
values = [float(val) for val in ret.strip().split(" ")]
|
||||
for val, (_, signal_name) in zip(values, channels):
|
||||
res[signal_name] = {"value": val, "timestamp": timestamp}
|
||||
return res
|
||||
|
||||
Reference in New Issue
Block a user