fix(api): Fix issue where previous cal offsets are used when calibrat…

…ing the instruments. (#13325)
Opentrons · Aug 16, 2023 · a882af1 · a882af1
1 parent bb10fcc
commit a882af1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 12 deletions.
diff --git a/api/src/opentrons/hardware_control/instruments/ot3/gripper.py b/api/src/opentrons/hardware_control/instruments/ot3/gripper.py
@@ -242,10 +242,7 @@ def _reload_gripper(
     # are similar enough that we might skip, see if the configs
     # match closely enough.
     # Returns a gripper object
-    if (
-        new_config == attached_instr.config
-        and cal_offset == attached_instr._calibration_offset
-    ):
+    if new_config == attached_instr.config:
         # Same config, good enough
         return attached_instr, True
     else:

diff --git a/api/src/opentrons/hardware_control/instruments/ot3/pipette.py b/api/src/opentrons/hardware_control/instruments/ot3/pipette.py
@@ -565,10 +565,7 @@ def _reload_and_check_skip(
     # match closely enough.
     # Returns a pipette object and True if we may skip hw reconfig
     # TODO this can potentially be removed in a follow-up refactor.
-    if (
-        new_config == attached_instr.config
-        and pipette_offset == attached_instr._pipette_offset
-    ):
+    if new_config == attached_instr.config:
         # Same config, good enough
         return attached_instr, True
     else:

diff --git a/api/tests/opentrons/hardware_control/test_gripper.py b/api/tests/opentrons/hardware_control/test_gripper.py
@@ -88,5 +88,3 @@ def test_reload_instrument_cal_ot3(fake_offset: "GripperCalibrationOffset") -> N
     assert new_gripper == old_gripper
     # we said upstream could skip
     assert skip
-    # only pipette offset has been updated
-    assert new_gripper._calibration_offset == new_cal
diff --git a/api/tests/opentrons/hardware_control/test_pipette.py b/api/tests/opentrons/hardware_control/test_pipette.py
@@ -399,5 +399,3 @@ def test_reload_instrument_cal_ot3(
     assert skipped
     # it's the same pipette
     assert new_pip == old_pip
-    # only pipette offset has been updated
-    assert new_pip._pipette_offset == new_cal