Skip to content

Commit 898887d

Browse files
authored
feat(protocol-designer, step-generation): introduce liquid class logic to consolidate (#18481)
This PR updates `consolidate` compound command creator in step-generation to mirror the behavior of `consolidate_with_liquid_class` Python API method. Implicated here is updating `getTransferPlanAndReferenceVolumes` util to take aspirate air gap into account for determining max tip working volume. Closes AUTH-1861
1 parent 6e1eeda commit 898887d

File tree

21 files changed

+4618
-1296
lines changed

21 files changed

+4618
-1296
lines changed

app/src/organisms/ODD/QuickTransferFlow/__tests__/utils/quickTransferStepCommands.test.ts

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -298,23 +298,25 @@ pipette.drop_tip()
298298
# CONSOLIDATE STEP
299299
300300
pipette.pick_up_tip(location=mock_tiprack_1)
301-
pipette.aspirate(
302-
volume=10,
303-
location=mock_labware_1["A1"].bottom(z=-1),
304-
flow_rate=56,
305-
)
306-
pipette.aspirate(
307-
volume=10,
308-
location=mock_labware_1["B1"].bottom(z=-1),
309-
flow_rate=56,
310-
)
311-
pipette.dispense(
312-
volume=20,
313-
location=mock_labware_2["B1"].bottom(z=-1),
314-
flow_rate=80,
315-
)
301+
pipette.move_to(mock_labware_1["A1"].top(z=2))
302+
pipette.prepare_to_aspirate()
303+
pipette.move_to(mock_labware_1["A1"].bottom())
304+
pipette.move_to(mock_labware_1["A1"].bottom())
305+
pipette.aspirate(volume=10, flow_rate=56)
306+
pipette.move_to(mock_labware_1["A1"].bottom())
307+
pipette.move_to(mock_labware_1["B1"].top(z=2))
308+
pipette.move_to(mock_labware_1["B1"].bottom())
309+
pipette.move_to(mock_labware_1["B1"].bottom())
310+
pipette.aspirate(volume=10, flow_rate=56)
311+
pipette.move_to(mock_labware_1["B1"].bottom())
312+
pipette.move_to(mock_labware_2["B1"].top(z=2))
313+
pipette.move_to(mock_labware_2["B1"].bottom())
314+
pipette.move_to(mock_labware_2["B1"].bottom())
315+
pipette.move_to(mock_labware_2["B1"].bottom())
316+
pipette.dispense(volume=20, flow_rate=80)
317+
pipette.move_to(mock_trash_bin_1)
316318
pipette.flow_rate.blow_out = 50
317-
pipette.blow_out(mock_trash_bin_1)
319+
pipette.blow_out()
318320
pipette.drop_tip()
319321
`.trim()
320322
)
@@ -417,7 +419,7 @@ pipette.move_to(mock_labware_2["B1"].bottom())
417419
pipette.move_to(mock_labware_2["B1"].bottom())
418420
pipette.dispense(volume=10, flow_rate=80)
419421
pipette.move_to(mock_labware_2["B1"].bottom())
420-
pipette.move_to(mock_labware_1["A1"].top())
422+
pipette.move_to(mock_labware_1["A1"].top(z=-1))
421423
pipette.flow_rate.blow_out = 50
422424
pipette.blow_out()
423425
pipette.drop_tip()

0 commit comments

Comments
 (0)