revert changes that are now in EXEC-643 branch

Opentrons · Sep 19, 2024 · d9cbfa6 · d9cbfa6
1 parent d55f398
commit d9cbfa6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 17 deletions.
diff --git a/api/src/opentrons/protocol_engine/commands/aspirate.py b/api/src/opentrons/protocol_engine/commands/aspirate.py
@@ -86,7 +86,6 @@ async def execute(self, params: AspirateParams) -> _ExecuteReturn:
         pipette_id = params.pipetteId
         labware_id = params.labwareId
         well_name = params.wellName
-        well_location = params.wellLocation
         volume = params.volume
 
         ready_to_aspirate = self._pipetting.get_is_ready_to_aspirate(
@@ -114,19 +113,12 @@ async def execute(self, params: AspirateParams) -> _ExecuteReturn:
                 well_name=well_name,
             )
 
-        # PE stuff first, make it's own PR (WellVolumeOffset, tests). Below not needed. Test on robot before Protocol API work
-        if well_location.origin == WellOrigin.MENISCUS:
-            # update well_location based on geometry maths. Create WellOrigin.MENISCUS_AT_VOLUME?
-            # well_location.offset = self._state_view._geometry.get_well_position_at_volume(well_location, volume)
-            pass
-
         position = await self._movement.move_to_well(
             pipette_id=pipette_id,
             labware_id=labware_id,
             well_name=well_name,
-            well_location=well_location,
+            well_location=params.wellLocation,
             current_well=current_well,
-            operation_volume=-volume,
         )
         deck_point = DeckPoint.construct(x=position.x, y=position.y, z=position.z)
         state_update.set_pipette_location(

diff --git a/api/src/opentrons/protocol_engine/execution/movement.py b/api/src/opentrons/protocol_engine/execution/movement.py
@@ -71,7 +71,6 @@ async def move_to_well(
         force_direct: bool = False,
         minimum_z_height: Optional[float] = None,
         speed: Optional[float] = None,
-        operation_volume: Optional[float] = None,
     ) -> Point:
         """Move to a specific well."""
         self._state_store.labware.raise_if_labware_inaccessible_by_pipette(

diff --git a/api/src/opentrons/protocol_engine/types.py b/api/src/opentrons/protocol_engine/types.py
@@ -239,18 +239,11 @@ class WellOffset(BaseModel):
     z: float = 0
 
 
-class WellVolumeOffset(BaseModel):
-    """A z-offset to account for volume in an operation."""
-
-    volumeOffset: Union[float, Literal["operationVolume"]] = 0
-
-
 class WellLocation(BaseModel):
     """A relative location in reference to a well's location."""
 
     origin: WellOrigin = WellOrigin.TOP
     offset: WellOffset = Field(default_factory=WellOffset)
-    volumeOffset: WellVolumeOffset = Field(default_factory=WellVolumeOffset)
 
 
 class DropTipWellLocation(BaseModel):