Formatting changes

Author: tomtrafford

src/ophyd_async/epics/pmac/__init__.py

@@ -1,4 +1,4 @@
-from ._pmacIO import Pmac, PmacMotor
-from ._pmacTrajectory import PmacTrajectoryTriggerLogic, PmacTrajInfo
+from ._pmac_io import Pmac, PmacMotor
+from ._pmac_trajectory import PmacTrajectoryTriggerLogic, PmacTrajInfo
 
 __all__ = ["Pmac", "PmacMotor", "PmacTrajectoryTriggerLogic", "PmacTrajInfo"]

src/ophyd_async/epics/pmac/_pmacIO.py renamed to src/ophyd_async/epics/pmac/_pmac_io.py

@@ -51,6 +51,6 @@ class PmacMotor(motor.Motor):
     """Device that moves a PMAC Motor record"""
 
     def __init__(self, prefix: str, name: str = "") -> None:
-        self.CsAxis = epics_signal_r(str, f"{prefix}:CsAxis_RBV")
-        self.CsPort = epics_signal_r(str, f"{prefix}:CsPort_RBV")
+        self.cs_axis = epics_signal_r(str, f"{prefix}:CsAxis_RBV")
+        self.cs_port = epics_signal_r(str, f"{prefix}:CsPort_RBV")
         super().__init__(prefix=prefix, name=name)

src/ophyd_async/epics/pmac/_pmacTrajectory.py renamed to src/ophyd_async/epics/pmac/_pmac_trajectory.py

@@ -1,5 +1,5 @@
 import time
-from typing import Any
+from typing import Any, Literal
 
 import numpy as np
 import numpy.typing as npt
@@ -17,7 +17,7 @@
 
 
 class PmacTrajInfo(BaseModel):
-    spec: Spec = Field(default=None)
+    spec: Spec[PmacMotor | Literal["DURATION"]] = Field(default=None)
 
 
 class PmacTrajectoryTriggerLogic(FlyerController[PmacTrajInfo]):
@@ -201,8 +201,8 @@ async def get_cs_info(self, motor: PmacMotor) -> tuple[str, int]:
             cs_index = int(split[1].strip()) - 1
         else:
             # Raw Motor
-            cs_port = await motor.CsPort.get_value()
-            cs_axis = await motor.CsAxis.get_value()
+            cs_port = await motor.cs_port.get_value()
+            cs_axis = await motor.cs_axis.get_value()
             cs_index = "ABCUVWXYZ".index(cs_axis)
 
         return cs_port, cs_index

tests/epics/pmac/test_pmac.py

@@ -36,8 +36,8 @@ async def sim_y_motor():
     set_mock_value(sim_motor.max_velocity, 5)
     set_mock_value(sim_motor.velocity, 0.5)
     set_mock_value(sim_motor.output_link, "@asyn(BRICK1,8)")
-    set_mock_value(sim_motor.CsAxis, "Y")
-    set_mock_value(sim_motor.CsPort, "BRICK1.CS3")
+    set_mock_value(sim_motor.cs_axis, "Y")
+    set_mock_value(sim_motor.cs_port, "BRICK1.CS3")
 
     yield sim_motor