From a9feef5d27b935907ada15e440c2429e2043105f Mon Sep 17 00:00:00 2001 From: Ryan Howard Date: Wed, 17 Jan 2024 14:34:37 -0500 Subject: [PATCH] fix trashing tips on 8 channel --- hardware-testing/hardware_testing/gravimetric/execute.py | 4 +++- hardware-testing/hardware_testing/gravimetric/helpers.py | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hardware-testing/hardware_testing/gravimetric/execute.py b/hardware-testing/hardware_testing/gravimetric/execute.py index aff947024379..e796e584f6fa 100644 --- a/hardware-testing/hardware_testing/gravimetric/execute.py +++ b/hardware-testing/hardware_testing/gravimetric/execute.py @@ -641,6 +641,7 @@ def run(cfg: config.GravimetricConfig, resources: TestResources) -> None: # noq resources.pipette, return_tip=False, minimum_z_height=_minimum_z_height(cfg), + offset=_get_channel_offset(cfg,0) ) # always trash calibration tips calibration_tip_in_use = False trial_count = 0 @@ -738,7 +739,8 @@ def run(cfg: config.GravimetricConfig, resources: TestResources) -> None: # noq if not cfg.same_tip: resources.pipette._retract() # retract to top of gantry _drop_tip( - resources.pipette, cfg.return_tip, _minimum_z_height(cfg) + resources.pipette, cfg.return_tip, _minimum_z_height(cfg), + _get_channel_offset(cfg,run_trial.channel) ) ui.print_header(f"{volume} uL channel {channel + 1} CALCULATIONS") diff --git a/hardware-testing/hardware_testing/gravimetric/helpers.py b/hardware-testing/hardware_testing/gravimetric/helpers.py index 10a501cef872..b865b90f316a 100644 --- a/hardware-testing/hardware_testing/gravimetric/helpers.py +++ b/hardware-testing/hardware_testing/gravimetric/helpers.py @@ -309,12 +309,15 @@ def _pick_up_tip( def _drop_tip( - pipette: InstrumentContext, return_tip: bool, minimum_z_height: int = 0 + pipette: InstrumentContext, return_tip: bool, minimum_z_height: int = 0, offset: Optional[Point] = None ) -> None: if return_tip: pipette.return_tip(home_after=False) else: - pipette.drop_tip(home_after=False) + if offset is not None: + pipette.drop_tip(pipette.trash_container.move(offset), home_after=False) + else: + pipette.drop_tip(home_after=False) if minimum_z_height > 0: cur_location = pipette._get_last_location_by_api_version() if cur_location is not None: