chore(api): go back to full blowout (#13479)

With the advent of push_out, we don't need a default blowout volume that isn't just "the full remaining length of the pipette" anymore - we can always default to moving to the end. 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 15, 2023 · 0cfaf25 · 0cfaf25
1 parent a48b618
commit 0cfaf25
Show file tree

Hide file tree

Showing 77 changed files with 217 additions and 922 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/conftest.py b/api/tests/opentrons/protocol_engine/conftest.py
@@ -223,6 +223,5 @@ def supported_tip_fixture() -> pipette_definition.SupportedTipsDefinition:
         defaultReturnTipHeight=0.5,
         aspirate=pipette_definition.ulPerMMDefinition(default={"1": [(0, 0, 0)]}),
         dispense=pipette_definition.ulPerMMDefinition(default={"1": [(0, 0, 0)]}),
-        defaultBlowoutVolume=5,
         defaultPushOutVolume=3,
     )
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/pipette/definitions/2/liquid/eight_channel/p10/default/1_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/default/1_0.json
@@ -38,7 +38,6 @@
           "2": [[12.74444519, 0, 0.8058688085]]
         }
       },
-      "defaultBlowoutVolume": 2.356,
       "defaultPushOutVolume": 0
     }
   },

diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/default/1_3.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/default/1_3.json
@@ -38,7 +38,6 @@
           "2": [[12.74444519, 0, 0.8058688085]]
         }
       },
-      "defaultBlowoutVolume": 2.356,
       "defaultPushOutVolume": 0
     }
   },

diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/default/1_4.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/default/1_4.json
@@ -38,7 +38,6 @@
           "2": [[12.74444519, 0, 0.8058688085]]
         }
       },
-      "defaultBlowoutVolume": 2.356,
       "defaultPushOutVolume": 0
     }
   },

diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/default/1_5.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/default/1_5.json
@@ -26,10 +26,7 @@
           ]
         }
       },
-      "dispense": {
-        "default": { "1": [[12.74444519, 0.0, 0.8058688085]] }
-      },
-      "defaultBlowoutVolume": 2.356,
+      "dispense": { "default": { "1": [[12.74444519, 0.0, 0.8058688085]] } },
       "defaultPushOutVolume": 0
     }
   },

diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p10/default/1_6.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p10/default/1_6.json
@@ -34,10 +34,7 @@
           ]
         }
       },
-      "dispense": {
-        "default": { "1": [[12.74444519, 0.0, 0.8058688085]] }
-      },
-      "defaultBlowoutVolume": 2.356,
+      "dispense": { "default": { "1": [[12.74444519, 0.0, 0.8058688085]] } },
       "defaultPushOutVolume": 0
     }
   },

diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p1000/default/1_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p1000/default/1_0.json
@@ -4,21 +4,15 @@
     "t50": {
       "defaultAspirateFlowRate": {
         "default": 6,
-        "valuesByApiLevel": {
-          "2.14": 6
-        }
+        "valuesByApiLevel": { "2.14": 6 }
       },
       "defaultDispenseFlowRate": {
         "default": 6,
-        "valuesByApiLevel": {
-          "2.14": 6
-        }
+        "valuesByApiLevel": { "2.14": 6 }
       },
       "defaultBlowOutFlowRate": {
         "default": 80,
-        "valuesByApiLevel": {
-          "2.14": 80
-        }
+        "valuesByApiLevel": { "2.14": 80 }
       },
       "defaultFlowAcceleration": 24000.0,
       "defaultTipLength": 57.9,
@@ -119,27 +113,20 @@
           ]
         }
       },
-      "defaultBlowoutVolume": -318.086,
       "defaultPushOutVolume": 7
     },
     "t200": {
       "defaultAspirateFlowRate": {
         "default": 80,
-        "valuesByApiLevel": {
-          "2.14": 80
-        }
+        "valuesByApiLevel": { "2.14": 80 }
       },
       "defaultDispenseFlowRate": {
         "default": 80,
-        "valuesByApiLevel": {
-          "2.14": 80
-        }
+        "valuesByApiLevel": { "2.14": 80 }
       },
       "defaultBlowOutFlowRate": {
         "default": 80,
-        "valuesByApiLevel": {
-          "2.14": 80
-        }
+        "valuesByApiLevel": { "2.14": 80 }
       },
       "defaultFlowAcceleration": 24000.0,
       "defaultTipLength": 58.35,
@@ -238,27 +225,20 @@
           ]
         }
       },
-      "defaultBlowoutVolume": -318.086,
       "defaultPushOutVolume": 5
     },
     "t1000": {
       "defaultAspirateFlowRate": {
         "default": 160,
-        "valuesByApiLevel": {
-          "2.14": 160
-        }
+        "valuesByApiLevel": { "2.14": 160 }
       },
       "defaultDispenseFlowRate": {
         "default": 160,
-        "valuesByApiLevel": {
-          "2.14": 160
-        }
+        "valuesByApiLevel": { "2.14": 160 }
       },
       "defaultBlowOutFlowRate": {
         "default": 80,
-        "valuesByApiLevel": {
-          "2.14": 80
-        }
+        "valuesByApiLevel": { "2.14": 80 }
       },
       "defaultFlowAcceleration": 24000.0,
       "defaultTipLength": 95.6,
@@ -357,7 +337,6 @@
           ]
         }
       },
-      "defaultBlowoutVolume": -318.086,
       "defaultPushOutVolume": 20
     }
   },

diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p1000/default/3_0.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p1000/default/3_0.json
@@ -4,21 +4,15 @@
     "t50": {
       "defaultAspirateFlowRate": {
         "default": 6,
-        "valuesByApiLevel": {
-          "2.14": 6
-        }
+        "valuesByApiLevel": { "2.14": 6 }
       },
       "defaultDispenseFlowRate": {
         "default": 6,
-        "valuesByApiLevel": {
-          "2.14": 6
-        }
+        "valuesByApiLevel": { "2.14": 6 }
       },
       "defaultBlowOutFlowRate": {
         "default": 80,
-        "valuesByApiLevel": {
-          "2.14": 80
-        }
+        "valuesByApiLevel": { "2.14": 80 }
       },
       "defaultFlowAcceleration": 24000.0,
       "defaultTipLength": 57.9,
@@ -119,27 +113,20 @@
           ]
         }
       },
-      "defaultBlowoutVolume": 3.2,
       "defaultPushOutVolume": 7
     },
     "t200": {
       "defaultAspirateFlowRate": {
         "default": 80,
-        "valuesByApiLevel": {
-          "2.14": 80
-        }
+        "valuesByApiLevel": { "2.14": 80 }
       },
       "defaultDispenseFlowRate": {
         "default": 80,
-        "valuesByApiLevel": {
-          "2.14": 80
-        }
+        "valuesByApiLevel": { "2.14": 80 }
       },
       "defaultBlowOutFlowRate": {
         "default": 80,
-        "valuesByApiLevel": {
-          "2.14": 80
-        }
+        "valuesByApiLevel": { "2.14": 80 }
       },
       "defaultFlowAcceleration": 24000.0,
       "defaultTipLength": 58.35,
@@ -238,27 +225,20 @@
           ]
         }
       },
-      "defaultBlowoutVolume": 16,
       "defaultPushOutVolume": 5
     },
     "t1000": {
       "defaultAspirateFlowRate": {
         "default": 160,
-        "valuesByApiLevel": {
-          "2.14": 160
-        }
+        "valuesByApiLevel": { "2.14": 160 }
       },
       "defaultDispenseFlowRate": {
         "default": 160,
-        "valuesByApiLevel": {
-          "2.14": 160
-        }
+        "valuesByApiLevel": { "2.14": 160 }
       },
       "defaultBlowOutFlowRate": {
         "default": 80,
-        "valuesByApiLevel": {
-          "2.14": 80
-        }
+        "valuesByApiLevel": { "2.14": 80 }
       },
       "defaultFlowAcceleration": 24000.0,
       "defaultTipLength": 95.6,
@@ -357,7 +337,6 @@
           ]
         }
       },
-      "defaultBlowoutVolume": 16,
       "defaultPushOutVolume": 20
     }
   },

diff --git a/shared-data/pipette/definitions/2/liquid/eight_channel/p1000/default/3_3.json b/shared-data/pipette/definitions/2/liquid/eight_channel/p1000/default/3_3.json
@@ -4,21 +4,15 @@
     "t50": {
       "defaultAspirateFlowRate": {
         "default": 6,
-        "valuesByApiLevel": {
-          "2.14": 6
-        }
+        "valuesByApiLevel": { "2.14": 6 }
       },
       "defaultDispenseFlowRate": {
         "default": 6,
-        "valuesByApiLevel": {
-          "2.14": 6
-        }
+        "valuesByApiLevel": { "2.14": 6 }
       },
       "defaultBlowOutFlowRate": {
         "default": 80,
-        "valuesByApiLevel": {
-          "2.14": 80
-        }
+        "valuesByApiLevel": { "2.14": 80 }
       },
       "defaultFlowAcceleration": 24000.0,
       "defaultTipLength": 57.9,
@@ -119,27 +113,20 @@
           ]
         }
       },
-      "defaultBlowoutVolume": 3.2,
       "defaultPushOutVolume": 7
     },
     "t200": {
       "defaultAspirateFlowRate": {
         "default": 80,
-        "valuesByApiLevel": {
-          "2.14": 80
-        }
+        "valuesByApiLevel": { "2.14": 80 }
       },
       "defaultDispenseFlowRate": {
         "default": 80,
-        "valuesByApiLevel": {
-          "2.14": 80
-        }
+        "valuesByApiLevel": { "2.14": 80 }
       },
       "defaultBlowOutFlowRate": {
         "default": 80,
-        "valuesByApiLevel": {
-          "2.14": 80
-        }
+        "valuesByApiLevel": { "2.14": 80 }
       },
       "defaultFlowAcceleration": 24000.0,
       "defaultTipLength": 58.35,
@@ -238,27 +225,20 @@
           ]
         }
       },
-      "defaultBlowoutVolume": 16,
       "defaultPushOutVolume": 5
     },
     "t1000": {
       "defaultAspirateFlowRate": {
         "default": 160,
-        "valuesByApiLevel": {
-          "2.14": 160
-        }
+        "valuesByApiLevel": { "2.14": 160 }
       },
       "defaultDispenseFlowRate": {
         "default": 160,
-        "valuesByApiLevel": {
-          "2.14": 160
-        }
+        "valuesByApiLevel": { "2.14": 160 }
       },
       "defaultBlowOutFlowRate": {
         "default": 80,
-        "valuesByApiLevel": {
-          "2.14": 80
-        }
+        "valuesByApiLevel": { "2.14": 80 }
       },
       "defaultFlowAcceleration": 24000.0,
       "defaultTipLength": 95.6,
@@ -357,7 +337,6 @@
           ]
         }
       },
-      "defaultBlowoutVolume": 16,
       "defaultPushOutVolume": 20
     }
   },
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,6 @@ @@
               "2": [[12.74444519, 0, 0.8058688085]]
             }
           },
-          "defaultBlowoutVolume": 2.356,
           "defaultPushOutVolume": 0
         }
       },
@@ Expand Down @@