diff --git a/api/src/opentrons/protocol_api/_waste_chute.py b/api/src/opentrons/protocol_api/_waste_chute.py index 7472327f941..8af8cafe445 100644 --- a/api/src/opentrons/protocol_api/_waste_chute.py +++ b/api/src/opentrons/protocol_api/_waste_chute.py @@ -3,9 +3,3 @@ class WasteChute: See :py:obj:`ProtocolContext.load_waste_chute`. """ - - def __init__( - self, - with_staging_area_slot_d4: bool, - ) -> None: - self._with_staging_area_slot_d4 = with_staging_area_slot_d4 diff --git a/api/src/opentrons/protocol_api/_waste_chute_dimensions.py b/api/src/opentrons/protocol_api/_waste_chute_dimensions.py index 70212bdc556..64635179d5e 100644 --- a/api/src/opentrons/protocol_api/_waste_chute_dimensions.py +++ b/api/src/opentrons/protocol_api/_waste_chute_dimensions.py @@ -1,18 +1,11 @@ """Constants for the dimensions of the Flex waste chute. -TODO: These should be moved into shared-data and interpreted by Protocol Engine. +TODO: Delete this when we resolve https://opentrons.atlassian.net/browse/RSS-418. """ from opentrons.types import Point - -SLOT_ORIGIN_TO_1_OR_8_TIP_A1 = Point(64, 21.91, 115) -SLOT_ORIGIN_TO_96_TIP_A1 = Point(14.445, 42.085, 115) - # TODO: This z-coord is misleading. We need to account for the labware height and the paddle height; # we can't define this as a single coordinate. SLOT_ORIGIN_TO_GRIPPER_JAW_CENTER = Point(64, 29, 136.5) - -# This is the same with or without the cover attached, since the cover is flush with the rim. -ENVELOPE_HEIGHT = 125 diff --git a/api/src/opentrons/protocol_api/protocol_context.py b/api/src/opentrons/protocol_api/protocol_context.py index e89b4873007..36d87c5e2f3 100644 --- a/api/src/opentrons/protocol_api/protocol_context.py +++ b/api/src/opentrons/protocol_api/protocol_context.py @@ -471,8 +471,6 @@ def load_trash_bin(self, location: DeckLocation) -> TrashBin: @requires_version(2, 16) def load_waste_chute( self, - *, - with_staging_area_slot_d4: bool = False, ) -> WasteChute: """Load the waste chute on the deck. @@ -480,11 +478,7 @@ def load_waste_chute( load another item in slot D3 after loading the waste chute, or vice versa, the API will raise an error. """ - if with_staging_area_slot_d4: - raise NotImplementedError( - "The waste chute staging area slot is not currently implemented." - ) - waste_chute = WasteChute(with_staging_area_slot_d4=with_staging_area_slot_d4) + waste_chute = WasteChute() self._core.append_disposal_location(waste_chute) return waste_chute