Replace child_resource_location with child_location (#364)

pylabrobot/incubators/cytomat/cytomat.py

@@ -111,7 +111,7 @@ async def send_command(self, command_type: str, command: str, params: str) -> st
     raise Exception(f"Unknown response from cytomat: {resp}")
 
   async def send_action(
-    self, command_type: str, command: str, params: str, timeout: Optional[int] = 10
+    self, command_type: str, command: str, params: str, timeout: Optional[int] = 60
   ) -> OverviewRegisterState:
     """Calls send_command, but has a timeout handler and returns the overview register state.
     Args:

pylabrobot/liquid_handling/liquid_handler.py

@@ -1888,7 +1888,7 @@ async def drop_resource(
     elif isinstance(destination, Coordinate):
       to_location = destination
     elif isinstance(destination, Tilter):
-      to_location = destination.get_absolute_location() + destination.child_resource_location
+      to_location = destination.get_absolute_location() + destination.child_location
     elif isinstance(destination, PlateHolder):
       if destination.resource is not None and destination.resource is not resource:
         raise RuntimeError("Destination already has a plate")
@@ -1967,7 +1967,7 @@ async def drop_resource(
         raise ValueError("Only ResourceStacks with direction 'z' are currently supported")
       destination.assign_child_resource(resource)
     elif isinstance(destination, Tilter):
-      destination.assign_child_resource(resource, location=destination.child_resource_location)
+      destination.assign_child_resource(resource, location=destination.child_location)
     elif isinstance(destination, PlateAdapter):
       if not isinstance(resource, Plate):
         raise ValueError("Only plates can be moved to a PlateAdapter")

pylabrobot/tilting/hamilton.py

@@ -12,7 +12,7 @@ def __init__(
     self,
     name: str,
     com_port: str,
-    child_resource_location: Coordinate = Coordinate(1.0, 3.0, 83.55),
+    child_location: Coordinate = Coordinate(1.0, 3.0, 83.55),
     pedestal_size_z: float = 3.47,
     write_timeout: float = 3,
     timeout: float = 3,
@@ -21,7 +21,7 @@ def __init__(
 
     Args:
       com_port: The communication port.
-      child_resource_location: The location of the child resource.
+      child_location: The location of the child resource.
       pedestal_size_z: The size of the pedestal in the z dimension.
       write_timeout: The write timeout. Defaults to 3.
       timeout: The timeout. Defaults to 3.
@@ -38,7 +38,7 @@ def __init__(
         timeout=timeout,
       ),
       hinge_coordinate=Coordinate(6.18, 0, 72.85),
-      child_resource_location=child_resource_location,
+      child_location=child_location,
       category="tilter",
       model=HamiltonTiltModule.__name__,
     )

pylabrobot/tilting/tilter.py

@@ -20,7 +20,7 @@ def __init__(
     size_z: float,
     backend: TilterBackend,
     hinge_coordinate: Coordinate,
-    child_resource_location: Coordinate,
+    child_location: Coordinate,
     category: Optional[str] = None,
     model: Optional[str] = None,
   ):
@@ -37,7 +37,7 @@ def __init__(
     self.backend: TilterBackend = backend  # fix type
     self._absolute_angle: float = 0
     self._hinge_coordinate = hinge_coordinate
-    self.child_resource_location = child_resource_location
+    self.child_location = child_location
 
   @property
   def absolute_angle(self) -> float: