lld mergeback conflict resolve

Opentrons · Aug 19, 2024 · 2a3000b · 2a3000b
1 parent c8d2b24
commit 2a3000b
Showing 1 changed file with 0 additions and 23 deletions.
diff --git a/api/src/opentrons/hardware_control/ot3api.py b/api/src/opentrons/hardware_control/ot3api.py
@@ -2688,15 +2688,6 @@ async def liquid_probe(
 
         # We need to significatly slow down the 96 channel liquid probe
         # TODO: (sigler) add LLD plunger-speed to pipette definitions
-        if self.gantry_load == GantryLoad.HIGH_THROUGHPUT:
-            max_plunger_speed = self.config.motion_settings.max_speed_discontinuity[
-                GantryLoad.HIGH_THROUGHPUT
-            ][OT3AxisKind.P]
-            probe_settings.plunger_speed = min(
-                max_plunger_speed, probe_settings.plunger_speed
-            )
-            D
-        # We need to significantly slow down the 96 channel liquid probe
         if self.gantry_load == GantryLoad.HIGH_THROUGHPUT:
             max_plunger_speed = self.config.motion_settings.max_speed_discontinuity[
                 GantryLoad.HIGH_THROUGHPUT
@@ -2706,20 +2697,6 @@ async def liquid_probe(
             )
 
         starting_position = await self.gantry_position(checked_mount, refresh=True)
-=======
-        probe_start_pos = await self.gantry_position(checked_mount, refresh=True)
-
-        # plunger travel distance is from TOP->BOTTOM (minus the backlash distance + impulse)
-        # FIXME: logic for how plunger moves is divided between here and tool_sensors.py
-        p_impulse_mm = (
-            probe_settings.plunger_impulse_time * probe_settings.plunger_speed
-        )
-        p_total_mm = (
-            instrument.plunger_positions.bottom - instrument.plunger_positions.top
-        )
-
-        p_working_mm = p_total_mm - (instrument.backlash_distance + p_impulse_mm)
->>>>>>> chore_release-8.0.0
 
         sensor_baseline_plunger_move_mm = (
             probe_settings.plunger_impulse_time * probe_settings.plunger_speed