diff --git a/pylabrobot/liquid_handling/backends/hamilton/__init__.py b/pylabrobot/liquid_handling/backends/hamilton/__init__.py index 4c36917049f..c32450df3b5 100644 --- a/pylabrobot/liquid_handling/backends/hamilton/__init__.py +++ b/pylabrobot/liquid_handling/backends/hamilton/__init__.py @@ -2,5 +2,6 @@ from .base import HamiltonLiquidHandler from .pump import Pump # TODO: move elsewhere. +from .prep import Prep from .STAR_backend import STAR from .vantage_backend import Vantage diff --git a/pylabrobot/liquid_handling/backends/hamilton/prep.py b/pylabrobot/liquid_handling/backends/hamilton/prep.py index b315ac291e2..46734c591f4 100644 --- a/pylabrobot/liquid_handling/backends/hamilton/prep.py +++ b/pylabrobot/liquid_handling/backends/hamilton/prep.py @@ -8,12 +8,12 @@ from pylabrobot.liquid_handling.backends import LiquidHandlerBackend from pylabrobot.liquid_handling.standard import ( - Aspiration, - AspirationContainer, - AspirationPlate, - Dispense, - DispenseContainer, - DispensePlate, + SingleChannelAspiration, + MultiHeadAspirationContainer, + MultiHeadAspirationPlate, + SingleChannelDispense, + MultiHeadDispenseContainer, + MultiHeadDispensePlate, Drop, DropTipRack, Pickup, @@ -260,7 +260,7 @@ def __init__(self, host: str = "192.168.100.102", port: int = 2000): self.port = port self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - async def setup(self): + async def setup(self, smart: bool = False): self.socket.connect((self.host, self.port)) self.socket.settimeout(30) @@ -271,7 +271,7 @@ async def setup(self): rolloff_distance=3, channel_parameters=[], ), - smart=False, + smart=smart, ) await super().setup() @@ -2465,7 +2465,7 @@ async def drop_tips( async def aspirate( self, - ops: List[Aspiration], + ops: List[SingleChannelAspiration], use_channels: List[int], z_final: float = 96.97, timeout: Optional[float] = None, @@ -2543,7 +2543,7 @@ async def aspirate( async def dispense( self, - ops: List[Dispense], + ops: List[SingleChannelDispense], use_channels: List[int], final_z: float = 96.97, timeout: Optional[float] = None, @@ -2623,10 +2623,10 @@ async def pick_up_tips96(self, pickup: PickupTipRack): async def drop_tips96(self, drop: DropTipRack): raise NotImplementedError("This operation is not supported on the Prep") - async def aspirate96(self, aspiration: Union[AspirationPlate, AspirationContainer]): + async def aspirate96(self, aspiration: Union[MultiHeadAspirationPlate, MultiHeadAspirationContainer]): raise NotImplementedError("This operation is not supported on the Prep") - async def dispense96(self, dispense: Union[DispensePlate, DispenseContainer]): + async def dispense96(self, dispense: Union[MultiHeadDispensePlate, MultiHeadDispenseContainer]): raise NotImplementedError("This operation is not supported on the Prep") async def pick_up_resource(self, pickup: ResourcePickup):