Merge pull request #100 from smartin015/fix_clearing_cooldown

Actually run bed clearing script when exiting cooldown mode

Author: smartin015

continuousprint/driver.py

@@ -266,17 +266,22 @@ def _state_start_clearing(self, a: Action, p: Printer):
             return self._state_clearing
 
     def _state_cooldown(self, a: Action, p: Printer):
+        clear = False
         if self._bed_temp < self.cooldown_threshold:
             self._logger.info(
                 f"Cooldown threshold of {self.cooldown_threshold} has been met"
             )
-            return self._state_clearing
+            clear = True
         elif (time.time() - self.cooldown_start) > (60 * self.cooldown_timeout):
             self._logger.info(f"Timeout of {self.cooldown_timeout} minutes exceeded")
-            return self._state_clearing
+            clear = True
         else:
             self._set_status("Cooling down")
 
+        if clear:
+            self._runner.clear_bed()
+            return self._state_clearing
+
     def _state_clearing(self, a: Action, p: Printer):
         if a == Action.SUCCESS:
             return self._enter_start_print(a, p)

continuousprint/driver_test.py

@@ -108,8 +108,10 @@ def test_bed_clearing_cooldown_threshold(self):
             DA.TICK, DP.IDLE, bed_temp=21
         )  # -> stays in cooldown since bed temp too high
         self.assertEqual(self.d.state.__name__, self.d._state_cooldown.__name__)
+        self.d._runner.clear_bed.assert_not_called()
         self.d.action(DA.TICK, DP.IDLE, bed_temp=19)  # -> exits cooldown
         self.assertEqual(self.d.state.__name__, self.d._state_clearing.__name__)
+        self.d._runner.clear_bed.assert_called()
 
     def test_bed_clearing_cooldown_timeout(self):
         self.d.set_managed_cooldown(True, 20, 60)
@@ -121,8 +123,10 @@ def test_bed_clearing_cooldown_timeout(self):
         self.d.action(DA.TICK, DP.IDLE, bed_temp=21)
         self.assertEqual(self.d.state.__name__, self.d._state_cooldown.__name__)
         self.d.cooldown_start = orig_start - 60 * 61
+        self.d._runner.clear_bed.assert_not_called()
         self.d.action(DA.TICK, DP.IDLE, bed_temp=21)  # exit due to timeout
         self.assertEqual(self.d.state.__name__, self.d._state_clearing.__name__)
+        self.d._runner.clear_bed.assert_called()
 
     def test_finishing_failure(self):
         self.d.state = self.d._state_finishing

continuousprint/script_runner.py

@@ -56,9 +56,8 @@ def start_cooldown(self):
         self._printer.set_temperature("bed", 0)  # turn bed off
 
     def clear_bed(self):
-        if self._get_key(Keys.BED_COOLDOWN_ENABLED):
-            self.wait_for_bed_cooldown()
-        return self._execute_gcode(Keys.CLEARING_SCRIPT)
+        self._msg("Clearing bed")
+        self._execute_gcode(Keys.CLEARING_SCRIPT)
 
     def start_print(self, item):
         self._msg(f"{item.job.name}: printing {item.path}")

continuousprint/script_runner_test.py

@@ -37,7 +37,6 @@ def test_cancel_print(self):
         self.s._printer.cancel_print.assert_called()
 
     def test_clear_bed(self):
-        self.s._get_key.return_value = False  # cooldown disabled
         self.s.clear_bed()
         self.s._printer.select_file.assert_called_with(
             "ContinuousPrint/cp_bed_clearing_script.gcode",