Skip to content

Commit

Permalink
fix trashing tips on 8 channel
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanthecoder committed Jan 17, 2024
1 parent 3b637a2 commit aa4fdd2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
4 changes: 3 additions & 1 deletion hardware-testing/hardware_testing/gravimetric/execute.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand Down
7 changes: 5 additions & 2 deletions hardware-testing/hardware_testing/gravimetric/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit aa4fdd2

Please sign in to comment.