chore(hardware-testing): update gravimetric patch files

Opentrons · Sep 5, 2023 · 23b6767 · 23b6767
1 parent 27689ea
commit 23b6767
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/hardware-testing/hardware_testing/gravimetric/overrides/api.patch b/hardware-testing/hardware_testing/gravimetric/overrides/api.patch
@@ -1,13 +1,8 @@
-diff --cc hardware-testing/hardware_testing/gravimetric/overrides/api.patch
-index 4035e961fa,1dfde3aa43..0000000000
-deleted file mode 100644,100644
---- a/hardware-testing/hardware_testing/gravimetric/overrides/api.patch
-+++ /dev/null
 diff --git a/api/src/opentrons/hardware_control/instruments/ot3/pipette.py b/api/src/opentrons/hardware_control/instruments/ot3/pipette.py
-index 815dada3b9..30121fc4c8 100644
+index 174a8f76e4..01b81cd6a0 100644
 --- a/api/src/opentrons/hardware_control/instruments/ot3/pipette.py
 +++ b/api/src/opentrons/hardware_control/instruments/ot3/pipette.py
-@@ -422,11 +422,11 @@ class Pipette(AbstractInstrument[PipetteConfigurations]):
+@@ -456,11 +456,11 @@ class Pipette(AbstractInstrument[PipetteConfigurations]):
 
      def set_current_volume(self, new_volume: float) -> None:
          assert new_volume >= 0
@@ -21,18 +16,18 @@ index 815dada3b9..30121fc4c8 100644
          self._current_volume += volume_incr
 
      def remove_current_volume(self, volume_incr: float) -> None:
-@@ -434,7 +434,8 @@ class Pipette(AbstractInstrument[PipetteConfigurations]):
+@@ -468,7 +468,8 @@ class Pipette(AbstractInstrument[PipetteConfigurations]):
          self._current_volume -= volume_incr
 
      def ok_to_add_volume(self, volume_incr: float) -> bool:
 -        return self.current_volume + volume_incr <= self.working_volume
 +        # return self.current_volume + volume_incr <= self.working_volume
 +        return True
 
-     def add_tip(self, tip_length: float) -> None:
-         """
+     def ok_to_push_out(self, push_out_dist_mm: float) -> bool:
+         return push_out_dist_mm <= (
 diff --git a/api/src/opentrons/protocol_api/core/legacy/deck.py b/api/src/opentrons/protocol_api/core/legacy/deck.py
-index 54bca33742..e6b49e47fe 100644
+index 0cddcabd9f..4111cf1cf2 100644
 --- a/api/src/opentrons/protocol_api/core/legacy/deck.py
 +++ b/api/src/opentrons/protocol_api/core/legacy/deck.py
 @@ -47,11 +47,11 @@ class DeckItem(Protocol):