Merge branch 'dev' into 080-backport-dev

Author: avanwinkle

.prospector.yaml

@@ -23,6 +23,7 @@ pylint:
   disable:
     - pointless-string-statement  # pointless statement, which is how our event docstrings are seen
     - too-few-public-methods
+    - too-many-positional-arguments  # many methods have many positional args
     - unsubscriptable-object    # broken on python 3.9
     # The following linter rules are disabled to make a refactor managable in chunks
     - consider-using-f-string  # temporarily disabling due to the 900+ instances to be replaced

mpf/devices/timer.py

@@ -144,8 +144,8 @@ def can_exist_outside_of_game(self):
     def _setup_control_events(self, event_list):
         self.debug_log("Setting up control events")
 
-        kwargs = {}
         for entry in event_list:
+            kwargs = {}
             if entry['action'] in ('add', 'subtract', 'jump', 'pause', 'set_tick_interval'):
                 handler = getattr(self, entry['action'])
                 kwargs = {'timer_value': entry['value']}

mpf/modes/service/code/service.py

@@ -560,6 +560,7 @@ def _generate_light_chains(self):  # pylint: disable=too-many-locals
             return
 
         items.sort(key=lambda x: x.chain)
+        return items
 
     async def _volume_menu(self, platform=None):
         position = 0

mpf/tests/machine_files/timer/modes/mode_with_timers/config/mode_with_timers.yaml

@@ -51,6 +51,11 @@ timers:
         tick_interval: 1s
         start_running: no
         control_events:
+            # Keep this event before the reset event to catch
+            # a regression about the order of timer events
+            - event: jump_timer_up
+              action: jump
+              value: 5
             - event: start_timer_up
               action: start
             - event: reset_timer_up
@@ -59,9 +64,6 @@ timers:
               action: stop
             - event: restart_timer_up
               action: restart
-            - event: jump_timer_up
-              action: jump
-              value: 5
             - event: jump_over_max_timer_up
               action: jump
               value: 20