Merge branch 'feature/device-aeroauto1' of https://gitlab.psi.ch/bec/ophyd_devices into feature/device-aeroauto1
This commit is contained in:
commit
75360a9636
@ -28,6 +28,17 @@ from .specMotors import (
|
||||
PmDetectorRotation,
|
||||
PmMonoBender,
|
||||
)
|
||||
|
||||
from .aerotech.AerotechAutomation1 import (
|
||||
aa1Controller,
|
||||
aa1Tasks,
|
||||
aa1GlobalVariables,
|
||||
aa1GlobalVariableBindings,
|
||||
aa1AxisPsoDistance,
|
||||
aa1AxisDriveDataCollection,
|
||||
EpicsMotorX,
|
||||
)
|
||||
|
||||
from .SpmBase import SpmBase
|
||||
from .aerotech.AerotechAutomation1 import aa1Controller, aa1Tasks, aa1GlobalVariables, aa1GlobalVariableBindings, aa1AxisPsoDistance, aa1AxisDriveDataCollection, EpicsMotorX
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user