Merge pull request #1626 from avanwinkle/timer-tick-event-on-restart

Post timer_(name)_tick event on restart when already running

mpf/devices/timer.py

@@ -252,7 +252,12 @@ def restart(self, **kwargs):
         """
         del kwargs
         self.reset()
-        self.start()
+        # If the timer is not running, start it
+        if not self.running:
+            self.start()
+        # If the timer is running, post an updated tick event
+        else:
+            self._post_tick_events()
 
     def stop(self, **kwargs):
         """Stop the timer and posts the 'timer_<name>_stopped' event.
@@ -363,8 +368,7 @@ def timer_complete(self, **kwargs):
 
             self.debug_log("Restart on complete: True")
 
-            self.reset()
-            self.start()
+            self.restart()
 
     def _timer_tick(self):
         # Automatically called by the core clock each tick

mpf/tests/test_Timer.py

@@ -337,6 +337,13 @@ def test_timer_events(self):
         self.advance_time_and_run()
         self.assertEqual(5, timer.ticks)
 
+        # Ensure that we get the 0 tick when it restarts
+        self.mock_event("timer_timer_up_tick")
+        self.post_event('restart_timer_up')
+        self.assertEqual(0, timer.ticks)
+        self.assertEventCalledWith("timer_timer_up_tick",
+                                   ticks=0, ticks_remaining=10)
+
     def test_interrupt_timer_by_mode_stop_with_player(self):
         self.machine.events.add_handler("timer_timer_down_tick", self._timer_tick)
         self.machine.events.add_handler("timer_timer_down_started", self._timer_start)