From 228fb97ca3970aff6b1fed7affeaefd317dc8525 Mon Sep 17 00:00:00 2001 From: wakonig_k Date: Wed, 25 Mar 2026 11:23:04 +0100 Subject: [PATCH] feat: add ecmc and vme user motor to device templates --- .../ophyd_templates.py | 20 +++++++++++++------ tests/test_interfaces_config_templates.py | 8 ++++---- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ophyd_devices/interfaces/device_config_templates/ophyd_templates.py b/ophyd_devices/interfaces/device_config_templates/ophyd_templates.py index d48e767..a6ea5d5 100644 --- a/ophyd_devices/interfaces/device_config_templates/ophyd_templates.py +++ b/ophyd_devices/interfaces/device_config_templates/ophyd_templates.py @@ -51,24 +51,32 @@ class EpicsSignalWithRBVDeviceConfigTemplate(BaseModel): # Dictionary mapping device groups to supported device class templates/variants. -OPHYD_DEVICE_TEMPLATES: dict[str, dict[str, dict[str, type]]] = { +OPHYD_DEVICE_TEMPLATES: dict[str, dict[str, dict[str, type | str]]] = { "EpicsMotor": { "EpicsMotor": { - "deviceClass": "ophyd.EpicsMotor", # "ophyd_devices.devices.EpicsMotor", + "deviceClass": "ophyd_devices.EpicsMotor", # "ophyd_devices.devices.EpicsMotor", "deviceConfig": EpicsMotorDeviceConfigTemplate, - } + }, + "EpicsMotorEC": { + "deviceClass": "ophyd_devices.EpicsMotorEC", # "ophyd_devices.devices.EpicsMotorEC", + "deviceConfig": EpicsMotorDeviceConfigTemplate, + }, + "EpicsUserMotorVME": { + "deviceClass": "ophyd_devices.EpicsUserMotorVME", # "ophyd_devices.devices.EpicsUserMotorVME", + "deviceConfig": EpicsMotorDeviceConfigTemplate, + }, }, "EpicsSignal": { "EpicsSignal": { - "deviceClass": "ophyd.EpicsSignal", + "deviceClass": "ophyd_devices.EpicsSignal", "deviceConfig": EpicsSignalDeviceConfigTemplate, }, "EpicsSignalRO": { - "deviceClass": "ophyd.EpicsSignalRO", + "deviceClass": "ophyd_devices.EpicsSignalRO", "deviceConfig": EpicsSignalRODeviceConfigTemplate, }, "EpicsSignalWithRBV": { - "deviceClass": "ophyd.EpicsSignalWithRBV", + "deviceClass": "ophyd_devices.EpicsSignalWithRBV", "deviceConfig": EpicsSignalWithRBVDeviceConfigTemplate, }, }, diff --git a/tests/test_interfaces_config_templates.py b/tests/test_interfaces_config_templates.py index 2e0cf8e..28bf6cb 100644 --- a/tests/test_interfaces_config_templates.py +++ b/tests/test_interfaces_config_templates.py @@ -19,24 +19,24 @@ def test_interfaces_OPHYD_DEVICE_TEMPLATES(): # Component level checks assert "EpicsMotor" in OPHYD_DEVICE_TEMPLATES["EpicsMotor"] template_info = OPHYD_DEVICE_TEMPLATES["EpicsMotor"]["EpicsMotor"] - assert "ophyd.EpicsMotor" == template_info.get("deviceClass", "") + assert "ophyd_devices.EpicsMotor" == template_info.get("deviceClass", "") assert issubclass(template_info.get("deviceConfig", object), EpicsMotorDeviceConfigTemplate) assert "EpicsSignalRO" in OPHYD_DEVICE_TEMPLATES["EpicsSignal"] template_info = OPHYD_DEVICE_TEMPLATES["EpicsSignal"]["EpicsSignalRO"] - assert "ophyd.EpicsSignalRO" == template_info.get("deviceClass", "") + assert "ophyd_devices.EpicsSignalRO" == template_info.get("deviceClass", "") assert issubclass(template_info.get("deviceConfig", object), EpicsSignalRODeviceConfigTemplate) assert "EpicsSignalWithRBV" in OPHYD_DEVICE_TEMPLATES["EpicsSignal"] template_info = OPHYD_DEVICE_TEMPLATES["EpicsSignal"]["EpicsSignalWithRBV"] - assert "ophyd.EpicsSignalWithRBV" == template_info.get("deviceClass", "") + assert "ophyd_devices.EpicsSignalWithRBV" == template_info.get("deviceClass", "") assert issubclass( template_info.get("deviceConfig", object), EpicsSignalWithRBVDeviceConfigTemplate ) assert "EpicsSignal" in OPHYD_DEVICE_TEMPLATES["EpicsSignal"] template_info = OPHYD_DEVICE_TEMPLATES["EpicsSignal"]["EpicsSignal"] - assert "ophyd.EpicsSignal" == template_info.get("deviceClass", "") + assert "ophyd_devices.EpicsSignal" == template_info.get("deviceClass", "") assert issubclass(template_info.get("deviceConfig", object), EpicsSignalDeviceConfigTemplate) assert "CustomDevice" in OPHYD_DEVICE_TEMPLATES["CustomDevice"]