fix(api): go back to full blowout

We added a default blowout volume to fix essentially the same issue that push_out fixes better. Now that we have push_out, let's go back to the full-length blowout as default (though we retain the ability to override it on command).
Opentrons · Sep 7, 2023 · 38c1b10 · 38c1b10
1 parent 9d211b6
commit 38c1b10
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 12 deletions.
diff --git a/api/src/opentrons/hardware_control/dev_types.py b/api/src/opentrons/hardware_control/dev_types.py
@@ -92,7 +92,6 @@ class PipetteDict(InstrumentDict):
     default_blow_out_speeds: Dict[str, float]
     ready_to_aspirate: bool
     has_tip: bool
-    default_blow_out_volume: float
     default_push_out_volume: Optional[float]
     supported_tips: Dict[PipetteTipType, SupportedTipsDefinition]
 

diff --git a/api/src/opentrons/hardware_control/instruments/ot3/pipette_handler.py b/api/src/opentrons/hardware_control/instruments/ot3/pipette_handler.py
@@ -272,9 +272,6 @@ def get_attached_instrument(self, mount: OT3Mount) -> PipetteDict:
                 alvl: self.plunger_speed(instr, fr, "aspirate")
                 for alvl, fr in instr.aspirate_flow_rates_lookup.items()
             }
-            result[
-                "default_blow_out_volume"
-            ] = instr.active_tip_settings.default_blowout_volume
             result[
                 "default_push_out_volume"
             ] = instr.active_tip_settings.default_push_out_volume
@@ -645,11 +642,7 @@ def plan_check_blow_out(
             instrument.plunger_positions.blow_out - instrument.plunger_positions.bottom
         )
         if volume is None:
-            ul = self.get_attached_instrument(mount)["default_blow_out_volume"]
-            distance_mm = max(
-                ul / instrument.ul_per_mm(ul, "blowout"),
-                max_distance,
-            )
+            distance_mm = max_distance
         else:
             ul = volume
             distance_mm = ul / instrument.ul_per_mm(ul, "blowout")

diff --git a/api/tests/opentrons/protocol_engine/resources/test_pipette_data_provider.py b/api/tests/opentrons/protocol_engine/resources/test_pipette_data_provider.py
@@ -80,7 +80,6 @@ def test_get_pipette_static_config(
         "default_blow_out_speeds": {"2.0": 5.021202, "2.6": 10.042404},
         "default_dispense_speeds": {"2.0": 5.021202, "2.6": 10.042404},
         "default_aspirate_speeds": {"2.0": 5.021202, "2.6": 10.042404},
-        "default_blow_out_volume": 10,
         "default_push_out_volume": 3,
         "supported_tips": {pip_types.PipetteTipType.t300: supported_tip_fixture},
     }

diff --git a/shared-data/python/opentrons_shared_data/pipette/pipette_definition.py b/shared-data/python/opentrons_shared_data/pipette/pipette_definition.py
@@ -1,5 +1,5 @@
 import re
-from typing import List, Dict, Tuple, Optional
+from typing import List, Dict, Tuple
 from pydantic import BaseModel, Field, validator
 from typing_extensions import Literal
 from dataclasses import dataclass

diff --git a/shared-data/python/opentrons_shared_data/pipette/scripts/build_json_script.py b/shared-data/python/opentrons_shared_data/pipette/scripts/build_json_script.py
@@ -277,7 +277,6 @@ def fill_blowout_configs(
 
     general_config_files = Path(GENERAL_ROOT).glob("*")
     for pipette_type in general_config_files:  # single, eight, 96-channel
-        pipette_type_str = str(pipette_type).split("/")[-1]
         for volume in volumes:  # pipette max volume- p10, p20, p50, etc.
             shaft_diameter = shaft_diameters[volume]
             # calculate uL per mm, default blowout vol