Skip to content

Commit

Permalink
fix(hardware-testing): Use correct import name of 96ch during gravime…
Browse files Browse the repository at this point in the history
…tric LPC protocol (#14404)
  • Loading branch information
andySigler authored Feb 1, 2024
1 parent 85d5007 commit 1e10a79
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
25 changes: 25 additions & 0 deletions hardware-testing/hardware_testing/gravimetric/overrides/api.patch
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,31 @@ index 2d36460ca6..8578768930 100644

def ok_to_push_out(self, push_out_dist_mm: float) -> bool:
return push_out_dist_mm <= (
diff --git a/api/src/opentrons/protocol_api/core/engine/deck_conflict.py b/api/src/opentrons/protocol_api/core/engine/deck_conflict.py
index 7ef2cfcbea..a89548afea 100644
--- a/api/src/opentrons/protocol_api/core/engine/deck_conflict.py
+++ b/api/src/opentrons/protocol_api/core/engine/deck_conflict.py
@@ -223,18 +223,12 @@ def check_safe_for_tip_pickup_and_return(
f" when picking up fewer than 96 tips."
)
elif not is_partial_config and not is_96_ch_tiprack_adapter:
- raise UnsuitableTiprackForPipetteMotion(
- f"{tiprack_name} must be on an Opentrons Flex 96 Tip Rack Adapter"
- f" in order to pick up or return all 96 tips simultaneously."
- )
+ pass

elif (
not is_partial_config
): # tiprack is not on adapter and pipette is in full config
- raise UnsuitableTiprackForPipetteMotion(
- f"{tiprack_name} must be on an Opentrons Flex 96 Tip Rack Adapter"
- f" in order to pick up or return all 96 tips simultaneously."
- )
+ pass


def _check_deck_conflict_for_96_channel(
diff --git a/api/src/opentrons/protocol_api/core/legacy/deck.py b/api/src/opentrons/protocol_api/core/legacy/deck.py
index 9a9092af5a..33aa5941ce 100644
--- a/api/src/opentrons/protocol_api/core/legacy/deck.py
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def run(ctx: ProtocolContext) -> None:
if size == 50 # only calibrate 50ul tip-racks
]
scale_labware = ctx.load_labware(LABWARE_ON_SCALE, SLOT_SCALE)
pipette = ctx.load_instrument("p1000_96", "left")
pipette = ctx.load_instrument("flex_96channel_1000", "left")
for rack in tipracks:
pipette.pick_up_tip(rack["A1"])
pipette.aspirate(10, scale_labware["A1"].top())
Expand Down

0 comments on commit 1e10a79

Please sign in to comment.