fixed rebase ouchies

Opentrons · Jan 30, 2025 · 303da65 · 303da65
1 parent 9eaab01
commit 303da65
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 1 deletion.
diff --git a/api/src/opentrons/protocol_api/core/engine/instrument.py b/api/src/opentrons/protocol_api/core/engine/instrument.py
@@ -150,6 +150,7 @@ def aspirate(
         rate: float,
         flow_rate: float,
         in_place: bool,
+        correction_volume: float = 0.0,
         meniscus_tracking: Optional[MeniscusTrackingTarget] = None,
     ) -> None:
         """Aspirate a given volume of liquid from the specified location.
@@ -241,6 +242,7 @@ def dispense(
         flow_rate: float,
         in_place: bool,
         push_out: Optional[float],
+        correction_volume: float = 0.0,
         meniscus_tracking: Optional[MeniscusTrackingTarget] = None,
     ) -> None:
         """Dispense a given volume of liquid into the specified location.

diff --git a/api/src/opentrons/protocol_api/core/instrument.py b/api/src/opentrons/protocol_api/core/instrument.py
@@ -45,6 +45,7 @@ def aspirate(
         rate: float,
         flow_rate: float,
         in_place: bool,
+        correction_volume: float = 0.0,
         meniscus_tracking: Optional[types.MeniscusTrackingTarget] = None,
     ) -> None:
         """Aspirate a given volume of liquid from the specified location.
@@ -70,6 +71,7 @@ def dispense(
         flow_rate: float,
         in_place: bool,
         push_out: Optional[float],
+        correction_volume: float = 0.0,
         meniscus_tracking: Optional[types.MeniscusTrackingTarget] = None,
     ) -> None:
         """Dispense a given volume of liquid into the specified location.

diff --git a/api/src/opentrons/protocol_api/core/legacy/legacy_instrument_core.py b/api/src/opentrons/protocol_api/core/legacy/legacy_instrument_core.py
@@ -87,6 +87,7 @@ def aspirate(
         rate: float,
         flow_rate: float,
         in_place: bool,
+        correction_volume: float = 0.0,
         meniscus_tracking: Optional[types.MeniscusTrackingTarget] = None,
     ) -> None:
         """Aspirate a given volume of liquid from the specified location.
@@ -132,6 +133,7 @@ def dispense(
         flow_rate: float,
         in_place: bool,
         push_out: Optional[float],
+        correction_volume: float = 0.0,
         meniscus_tracking: Optional[types.MeniscusTrackingTarget] = None,
     ) -> None:
         """Dispense a given volume of liquid into the specified location.

diff --git a/api/src/opentrons/protocol_api/core/legacy_simulator/legacy_instrument_core.py b/api/src/opentrons/protocol_api/core/legacy_simulator/legacy_instrument_core.py
@@ -100,6 +100,7 @@ def aspirate(
         rate: float,
         flow_rate: float,
         in_place: bool,
+        correction_volume: float = 0.0,
         meniscus_tracking: Optional[types.MeniscusTrackingTarget] = None,
     ) -> None:
         if self.get_current_volume() == 0:
@@ -142,6 +143,7 @@ def dispense(
         flow_rate: float,
         in_place: bool,
         push_out: Optional[float],
+        correction_volume: float = 0.0,
         meniscus_tracking: Optional[types.MeniscusTrackingTarget] = None,
     ) -> None:
         if isinstance(location, (TrashBin, WasteChute)):

diff --git a/api/tests/opentrons/protocol_api/core/engine/test_transfer_components_executor.py b/api/tests/opentrons/protocol_api/core/engine/test_transfer_components_executor.py
@@ -286,7 +286,6 @@ def test_mix(
             rate=1,
             flow_rate=aspirate_flow_rate,
             in_place=True,
-            is_meniscus=None,
             correction_volume=aspirate_correction_volume,
         ),
         mock_instrument_core.delay(0.2),

diff --git a/api/tests/opentrons/protocol_api/test_instrument_context.py b/api/tests/opentrons/protocol_api/test_instrument_context.py
@@ -1547,6 +1547,7 @@ def test_mix_no_lpd(
             1.23,
             5.67,
             False,
+            0.0,
             None,
         ),
         times=10,
@@ -1563,6 +1564,7 @@ def test_mix_no_lpd(
                 5.67,
                 False,
                 None,
+                0.0,
                 None,
             ),
             times=10,
@@ -1577,6 +1579,7 @@ def test_mix_no_lpd(
                 5.67,
                 False,
                 0.0,
+                0.0,
                 None,
             ),
             times=9,
@@ -1590,6 +1593,7 @@ def test_mix_no_lpd(
                 5.67,
                 False,
                 None,
+                0.0,
                 None,
             ),
             times=1,
@@ -1647,6 +1651,7 @@ def test_mix_with_lpd(
             1.23,
             5.67,
             False,
+            0.0,
             None,
         ),
         times=10,
@@ -1660,6 +1665,7 @@ def test_mix_with_lpd(
             5.67,
             False,
             0.0,
+            0.0,
             None,
         ),
         times=9,
@@ -1673,6 +1679,7 @@ def test_mix_with_lpd(
             5.67,
             False,
             None,
+            0.0,
             None,
         ),
         times=1,
-Original file line number
+Diff line change
@@ Expand Up / @@ -1547,6 +1547,7 @@ def test_mix_no_lpd( @@
 .23,
 .67,
                 False,
+.0,
                 None,
             ),
             times=10,
@@ Expand All / @@ -1563,6 +1564,7 @@ def test_mix_no_lpd( @@
 .67,
                     False,
                     None,
+.0,
                     None,
                 ),
                 times=10,
@@ Expand All / @@ -1577,6 +1579,7 @@ def test_mix_no_lpd( @@
 .67,
                     False,
 .0,
+.0,
                     None,
                 ),
                 times=9,
@@ Expand All / @@ -1590,6 +1593,7 @@ def test_mix_no_lpd( @@
 .67,
                     False,
                     None,
+.0,
                     None,
                 ),
                 times=1,
@@ Expand Down Expand Up / @@ -1647,6 +1651,7 @@ def test_mix_with_lpd( @@
 .23,
 .67,
                 False,
+.0,
                 None,
             ),
             times=10,
@@ Expand All / @@ -1660,6 +1665,7 @@ def test_mix_with_lpd( @@
 .67,
                 False,
 .0,
+.0,
                 None,
             ),
             times=9,
@@ Expand All / @@ -1673,6 +1679,7 @@ def test_mix_with_lpd( @@
 .67,
                 False,
                 None,
+.0,
                 None,
             ),
             times=1,
@@ Expand Down @@