From a3a0a5c2a7982eec209e1f6897c9c4ef2c366592 Mon Sep 17 00:00:00 2001 From: Andy Sigler Date: Tue, 6 Aug 2024 12:02:13 -0400 Subject: [PATCH] undo api and shared-data edits --- api/src/opentrons/hardware_control/ot3api.py | 10 +++------- .../definitions/2/geometry/single_channel/p50/3_5.json | 2 +- .../definitions/2/geometry/single_channel/p50/3_6.json | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/api/src/opentrons/hardware_control/ot3api.py b/api/src/opentrons/hardware_control/ot3api.py index 214bcd8ec46..5f9c9840834 100644 --- a/api/src/opentrons/hardware_control/ot3api.py +++ b/api/src/opentrons/hardware_control/ot3api.py @@ -5,7 +5,6 @@ from dataclasses import replace import logging from collections import OrderedDict -from math import isclose from typing import ( AsyncIterator, cast, @@ -2731,9 +2730,6 @@ async def liquid_probe( max_z_dist - probe_start_pos.z + pass_start_pos.z ) / probe_settings.mount_speed p_travel_required_for_z = max_z_time * probe_settings.plunger_speed - - # if total_travel_left < working range of plunger axis, dont keep going past the total travel - # min(total_travel_left_to_do, working_range_of_plunger_axis) p_pass_travel = min(p_travel_required_for_z, p_working_mm) # Prep the plunger await self.move_to(checked_mount, safe_plunger_pos) @@ -2758,9 +2754,9 @@ async def liquid_probe( except PipetteLiquidNotFoundError as lnfe: error = lnfe pos = await self.gantry_position(checked_mount, refresh=True) - # await self.move_to(checked_mount, probe_start_pos + top_types.Point(z=2)) - # await self.prepare_for_aspirate(checked_mount) - # await self.move_to(checked_mount, probe_start_pos) + await self.move_to(checked_mount, probe_start_pos + top_types.Point(z=2)) + await self.prepare_for_aspirate(checked_mount) + await self.move_to(checked_mount, probe_start_pos) if error is not None: # if we never found liquid raise an error raise error diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p50/3_5.json b/shared-data/pipette/definitions/2/geometry/single_channel/p50/3_5.json index ed558d30f11..b40f6957277 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p50/3_5.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p50/3_5.json @@ -13,7 +13,7 @@ }, "lldSettings": { "t50": { - "minHeight": 1.5, + "minHeight": 0.5, "minVolume": 0 } } diff --git a/shared-data/pipette/definitions/2/geometry/single_channel/p50/3_6.json b/shared-data/pipette/definitions/2/geometry/single_channel/p50/3_6.json index ed558d30f11..b40f6957277 100644 --- a/shared-data/pipette/definitions/2/geometry/single_channel/p50/3_6.json +++ b/shared-data/pipette/definitions/2/geometry/single_channel/p50/3_6.json @@ -13,7 +13,7 @@ }, "lldSettings": { "t50": { - "minHeight": 1.5, + "minHeight": 0.5, "minVolume": 0 } }