fix: Fix deactivate_heater function

Opentrons · Jul 21, 2022 · 3fb1547 · 3fb1547
1 parent 8f694cf
commit 3fb1547
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 23 deletions.
diff --git a/api/src/opentrons/hardware_control/emulation/heater_shaker.py b/api/src/opentrons/hardware_control/emulation/heater_shaker.py
@@ -138,7 +138,7 @@ def _get_labware_latch_state(self, command: Command) -> str:
         return f"M241 STATUS:{self._latch_status.value.upper()}"
 
     def _deactivate_heater(self, command: Command) -> str:
-        self._temperature.set_target(TEMPERATURE_ROOM)
+        self._temperature.deactivate(TEMPERATURE_ROOM)
         return "M106"
 
     @staticmethod

diff --git a/api/tests/opentrons/hardware_control/integration/test_heatershaker.py b/api/tests/opentrons/hardware_control/integration/test_heatershaker.py
@@ -82,22 +82,7 @@ async def test_deactivate_heater(heatershaker: HeaterShaker) -> None:
     assert 29.3 <= heatershaker.temperature <= 30.7
 
     await heatershaker.deactivate_heater()
-    assert heatershaker.target_temperature == TEMPERATURE_ROOM
-
-    # Have to wait for temperature to go down.
-    # Goes down 2 degrees per tick
-    await heatershaker.wait_next_poll()
-    await heatershaker.wait_next_poll()
-    await heatershaker.wait_next_poll()
-    await heatershaker.wait_next_poll()
-
-    # Temp should be in range
-    assert TEMP_ROOM_LOW <= heatershaker.temperature <= TEMP_ROOM_HIGH
-
-    await heatershaker.wait_next_poll()
-    await heatershaker.wait_next_poll()
-    await heatershaker.wait_next_poll()
-    # Temp should remain in range
+    assert heatershaker.target_temperature is None
     assert TEMP_ROOM_LOW <= heatershaker.temperature <= TEMP_ROOM_HIGH
 
 
@@ -106,12 +91,12 @@ async def test_temp(heatershaker: HeaterShaker) -> None:
 
     # Have to wait for next poll because target temp will not update until then
     await heatershaker.wait_next_poll()
-    await heatershaker.start_set_temperature(100.0)
-    assert heatershaker.target_temperature == 100.0
-    assert heatershaker.temperature != 100.0
+    await heatershaker.start_set_temperature(50.0)
+    assert heatershaker.target_temperature == 50.0
+    assert heatershaker.temperature != 50.0
 
-    await heatershaker.await_temperature(100.0)
-    assert heatershaker.target_temperature == 100.0
+    await heatershaker.await_temperature(50.0)
+    assert heatershaker.target_temperature == 50.0
 
     # Acceptable delta is 0.7 degrees
-    assert 99.3 <= heatershaker.temperature <= 100.7
+    assert 49.3 <= heatershaker.temperature <= 50.7