Skip to content

Commit 0734105

Browse files
committed
Merge branch 'abr-dvt1abr4-protocol' of https://github.com/Opentrons/opentrons into abr-dvt1abr4-protocol
2 parents 39d850a + afb6f35 commit 0734105

File tree

3 files changed

+34
-46
lines changed

3 files changed

+34
-46
lines changed

abr-testing/abr_testing/protocols/active_protocols/1_Simple Normalize Long Right.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
ParameterContext,
55
Labware,
66
SINGLE,
7+
ALL,
78
InstrumentContext,
89
Well,
910
)
@@ -93,7 +94,7 @@ def run(protocol: ProtocolContext) -> None:
9394

9495
reservoir = protocol.load_labware("nest_12_reservoir_15ml", "B3")
9596
waste_reservoir = protocol.load_labware(
96-
"nest_1_reservoir_195ml", "B1", "Liquid Waste"
97+
"nest_1_reservoir_195ml", "C1", "Liquid Waste"
9798
)
9899
sample_plate_2 = protocol.load_labware(
99100
"armadillo_96_wellplate_200ul_pcr_full_skirt", "C2"

abr-testing/abr_testing/protocols/active_protocols/5_96ch complex protocol with single tip Pick Up.py

Lines changed: 31 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""96 ch Test Single Tip and Gripper Moves."""
22
from opentrons.protocol_api import (
3-
ALL,
3+
COLUMN,
44
SINGLE,
55
ParameterContext,
66
ProtocolContext,
@@ -63,7 +63,7 @@ def run(ctx: ProtocolContext) -> None:
6363
helpers.temp_str, "C1"
6464
) # type: ignore[assignment]
6565
if disposable_lid:
66-
unused_lids = helpers.load_disposable_lids(ctx, 3, ["A4"], deck_riser)
66+
unused_lids = helpers.load_disposable_lids(ctx, 3, ["A2"], deck_riser)
6767
used_lids: List[Labware] = []
6868
thermocycler.open_lid()
6969
h_s.open_labware_latch()
@@ -77,12 +77,11 @@ def run(ctx: ProtocolContext) -> None:
7777

7878
source_reservoir = ctx.load_labware(RESERVOIR_NAME, "D2")
7979
dest_pcr_plate = ctx.load_labware(PCR_PLATE_96_NAME, "C2")
80-
liquid_waste = ctx.load_labware("nest_1_reservoir_195ml", "B3", "Liquid Waste")
80+
liquid_waste = ctx.load_labware("nest_1_reservoir_290ml", "B2", "Liquid Waste")
8181

8282
tip_rack_1 = ctx.load_labware(
83-
TIPRACK_96_NAME, "A2", adapter=TIPRACK_96_ADAPTER_NAME
83+
TIPRACK_96_NAME, "A4"
8484
)
85-
tip_rack_adapter = tip_rack_1.parent
8685

8786
tip_rack_2 = ctx.load_labware(TIPRACK_96_NAME, "C3")
8887
tip_rack_3 = ctx.load_labware(TIPRACK_96_NAME, "C4")
@@ -162,7 +161,7 @@ def test_gripper_moves() -> None:
162161
def deck_moves(labware: Labware, reset_location: str) -> None:
163162
"""Function to perform the movement of labware."""
164163
deck_move_sequence = [
165-
["B2"], # Deck Moves
164+
["B3"], # Deck Moves
166165
["C3"], # Staging Area Slot 3 Moves
167166
["C4", "D4"], # Staging Area Slot 4 Moves
168167
[
@@ -178,7 +177,7 @@ def deck_moves(labware: Labware, reset_location: str) -> None:
178177
def staging_area_slot_3_moves(labware: Labware, reset_location: str) -> None:
179178
"""Function to perform the movement of labware, starting w/ staging area slot 3."""
180179
staging_area_slot_3_move_sequence = [
181-
["B2", "C2"], # Deck Moves
180+
["B3", "C2"], # Deck Moves
182181
[], # Don't have Staging Area Slot 3 open
183182
["C4", "D4"], # Staging Area Slot 4 Moves
184183
[
@@ -199,7 +198,7 @@ def staging_area_slot_3_moves(labware: Labware, reset_location: str) -> None:
199198
def staging_area_slot_4_moves(labware: Labware, reset_location: str) -> None:
200199
"""Function to perform the movement of labware, starting with staging area slot 4."""
201200
staging_area_slot_4_move_sequence = [
202-
["C2", "B2"], # Deck Moves
201+
["C2", "B3"], # Deck Moves
203202
["C3"], # Staging Area Slot 3 Moves
204203
["C4"], # Staging Area Slot 4 Moves
205204
[
@@ -220,7 +219,7 @@ def staging_area_slot_4_moves(labware: Labware, reset_location: str) -> None:
220219
def module_moves(labware: Labware, module_locations: List) -> None:
221220
"""Function to perform the movement of labware, starting on a module."""
222221
module_move_sequence = [
223-
["C2", "B2"], # Deck Moves
222+
["C2", "B3"], # Deck Moves
224223
["C3"], # Staging Area Slot 3 Moves
225224
["C4", "D4"], # Staging Area Slot 4 Moves
226225
]
@@ -293,43 +292,31 @@ def test_single_tip_pickup_usage() -> None:
293292
# want to test partial drop
294293
ctx.move_labware(tip_rack_2, waste_chute, use_gripper=USING_GRIPPER)
295294

296-
def test_full_tip_rack_usage() -> None:
295+
def test_column_tip_rack_usage() -> None:
297296
"""Full Tip Pick Up."""
298-
pipette_96_channel.configure_nozzle_layout(style=ALL, start="A1")
299-
pipette_96_channel.liquid_presence_detection = True
300-
pipette_96_channel.pick_up_tip(tip_rack_1["A1"])
301-
302-
pipette_96_channel.aspirate(45, source_reservoir["A1"])
303-
304-
pipette_96_channel.liquid_presence_detection = False
305-
pipette_96_channel.air_gap(5)
306-
307-
pipette_96_channel.dispense(25, dest_pcr_plate["A1"].bottom(b))
308-
pipette_96_channel.blow_out(location=liquid_waste["A1"])
309-
pipette_96_channel.mix(repetitions=5, volume=15)
310-
pipette_96_channel.return_tip()
311-
312-
ctx.move_labware(tip_rack_1, waste_chute, use_gripper=USING_GRIPPER)
313-
ctx.move_labware(tip_rack_3, tip_rack_adapter, use_gripper=USING_GRIPPER)
314-
315-
pipette_96_channel.pick_up_tip(tip_rack_3["A1"])
316-
pipette_96_channel.transfer(
317-
volume=10,
318-
source=source_reservoir["A1"],
319-
dest=dest_pcr_plate["A1"],
320-
new_tip="never",
321-
touch_tip=True,
322-
blow_out=True,
323-
blowout_location="trash",
324-
mix_before=(3, 5),
325-
mix_after=(1, 5),
326-
)
327-
pipette_96_channel.return_tip()
328-
329-
ctx.move_labware(tip_rack_3, waste_chute, use_gripper=USING_GRIPPER)
330-
297+
list_of_columns = list(range(1,13))
298+
not_reversed = list(range(1,13))
299+
list_of_columns.reverse()
300+
i = 0
301+
column_racks = [tip_rack_1, tip_rack_3]
302+
for rack in column_racks:
303+
ctx.move_labware(rack, "C3", use_gripper = USING_GRIPPER)
304+
for (column,well) in zip(list_of_columns, not_reversed):
305+
tiprack_well = "A" + str(column)
306+
well_name = "A" + str(well)
307+
pipette_96_channel.configure_nozzle_layout(style=COLUMN, start="A12")
308+
pipette_96_channel.liquid_presence_detection = True
309+
pipette_96_channel.pick_up_tip(rack[tiprack_well])
310+
pipette_96_channel.aspirate(45, source_reservoir[well_name])
311+
pipette_96_channel.liquid_presence_detection = False
312+
pipette_96_channel.air_gap(5)
313+
pipette_96_channel.dispense(25, dest_pcr_plate[tiprack_well].bottom(b))
314+
pipette_96_channel.blow_out(location=liquid_waste["A1"])
315+
pipette_96_channel.drop_tip()
316+
ctx.move_labware(rack, waste_chute, use_gripper=USING_GRIPPER)
317+
i +=1
331318
test_single_tip_pickup_usage()
332-
test_full_tip_rack_usage()
319+
test_column_tip_rack_usage()
333320

334321
def test_module_usage(unused_lids: List[Labware], used_lids: List[Labware]) -> None:
335322
"""Test Module Use."""

abr-testing/abr_testing/protocols/liquid_setups/4_Illumina DNA Enrichment Liquid Setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
)
66

77
metadata = {
8-
"protocolName": "DRAFT - DVT1ABR4/8: Illumina DNA Enrichment Liquid Set Up",
8+
"protocolName": "DVT1ABR4/8: Illumina DNA Enrichment Liquid Set Up",
99
"author": "Tony Ngumah <[email protected]>",
1010
"source": "Protocol Library",
1111
}

0 commit comments

Comments
 (0)