bec/ophyd_devices
0
0
Fork 0
mirror of https://github.com/bec-project/ophyd_devices.git synced 2026-02-06 15:18:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: fixed id assignment

Browse Source
This commit is contained in:
wakonig_k
2023-11-07 15:42:17 +01:00
parent 23664e542c
commit 9b3139ecf1
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ophyd_devices/galil/fgalil_ophyd.py
View File

@@ -31,6 +31,8 @@ logger = bec_logger.logger
class FlomniGalilController(GalilController): class FlomniGalilController(GalilController):
def is_axis_moving(self, axis_Id, axis_Id_numeric) -> bool: def is_axis_moving(self, axis_Id, axis_Id_numeric) -> bool:
if axis_Id is None and axis_Id_numeric is not None:
axis_Id = self.axis_Id_numeric_to_alpha(axis_Id_numeric)
active_thread = self.is_thread_active(0) active_thread = self.is_thread_active(0)
motor_is_on = self.is_motor_on(axis_Id) motor_is_on = self.is_motor_on(axis_Id)
return bool(active_thread or motor_is_on) return bool(active_thread or motor_is_on)

16
ophyd_devices/galil/galil_ophyd.py
View File

@@ -137,7 +137,7 @@ class GalilController(Controller):
def is_axis_moving(self, axis_Id, axis_Id_numeric) -> bool: def is_axis_moving(self, axis_Id, axis_Id_numeric) -> bool:
if axis_Id is None and axis_Id_numeric is not None: if axis_Id is None and axis_Id_numeric is not None:
axis_Id = self._axis[axis_Id_numeric].axis_Id axis_Id = self.axis_Id_numeric_to_alpha(axis_Id_numeric)
is_moving = bool(float(self.socket_put_and_receive(f"MG_BG{axis_Id}")) != 0) is_moving = bool(float(self.socket_put_and_receive(f"MG_BG{axis_Id}")) != 0)
backlash_is_active = bool(float(self.socket_put_and_receive(f"MGbcklact[axis]")) != 0) backlash_is_active = bool(float(self.socket_put_and_receive(f"MGbcklact[axis]")) != 0)
return bool( return bool(
@@ -281,6 +281,14 @@ class GalilController(Controller):
if isinstance(controller, GalilController): if isinstance(controller, GalilController):
controller.describe() controller.describe()
@staticmethod
def axis_Id_to_numeric(axis_Id: str) -> int:
return ord(axis_Id.lower()) - 97
@staticmethod
def axis_Id_numeric_to_alpha(axis_Id_numeric: int) -> str:
return (chr(axis_Id_numeric + 97)).capitalize()
class GalilSignalBase(SocketSignal): class GalilSignalBase(SocketSignal):
def __init__(self, signal_name, **kwargs): def __init__(self, signal_name, **kwargs):
@@ -583,7 +591,7 @@ class GalilMotor(Device, PositionerBase):
if len(val) != 1: if len(val) != 1:
raise ValueError(f"Only single-character axis_Ids are supported.") raise ValueError(f"Only single-character axis_Ids are supported.")
self._axis_Id_alpha = val self._axis_Id_alpha = val
self._axis_Id_numeric = ord(val.lower()) - 97 self._axis_Id_numeric = self.controller.axis_Id_to_numeric(val)
else: else:
raise TypeError(f"Expected value of type str but received {type(val)}") raise TypeError(f"Expected value of type str but received {type(val)}")
@@ -596,8 +604,8 @@ class GalilMotor(Device, PositionerBase):
if isinstance(val, int): if isinstance(val, int):
if val > 26: if val > 26:
raise ValueError(f"Numeric value exceeds supported range.") raise ValueError(f"Numeric value exceeds supported range.")
self._axis_Id_alpha = val self._axis_Id_alpha = self.controller.axis_Id_numeric_to_alpha(val)
self._axis_Id_numeric = (chr(val + 97)).capitalize() self._axis_Id_numeric = val
else: else:
raise TypeError(f"Expected value of type int but received {type(val)}") raise TypeError(f"Expected value of type int but received {type(val)}")