bec/ophyd_devices
1
0
Fork 0
Code Issues 9 Pull Requests 10 Actions Packages Projects Releases 126 Wiki Activity

Fixed but to remove Thread Signal from Axis movements - working motions on samx/samy

Browse Source
This commit is contained in:
e21191 2023-05-22 08:31:17 +02:00 committed by e21206
parent 822b6b18f6
commit 26f834b933
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ophyd_devices/galil/sgalil_ophyd.py
View File

@ -49,7 +49,6 @@ class GalilController(Controller):
"galil_show_all",
"socket_put_and_receive",
"socket_put_confirmed",
"lgalil_is_air_off_and_orchestra_enabled",
]
def __init__(
@ -308,14 +307,11 @@ class GalilMotorIsMoving(GalilSignalRO):
def _socket_get(self):
if self.parent.axis_Id_numeric == 2:
ret = self.controller.is_axis_moving(self.parent.axis_Id, self.parent.axis_Id_numeric)
elif self.parent.axis_Id_numeric == 4:
return ret
if self.parent.axis_Id_numeric == 4:
# Motion signal from axis 4 is mapped to axis 5
ret = self.controller.is_axis_moving('F', 5)
return (
ret
or self.controller.is_thread_active(0)
or self.controller.is_thread_active(2)
)
return ret or self.controller.is_thread_active(4)
def get(self):
val = super().get()