Merge branch 'fast_er_final' into 80_fast_er

Author: bosh

.github/workflows/prospector.yml

@@ -14,11 +14,11 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v4
         with:
-          # Ubuntu can't run 3.12 because Pillow dependencies.
-          python-version: 3.11
+          python-version: 3.12
 
       - name: Install MPF
         run: |
+          sudo apt-get install -y libjpeg-dev
           pip install --upgrade pip setuptools wheel build prospector
           pip install -e .
 

.github/workflows/run_tests.yml

@@ -46,6 +46,10 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Install Linux dependencies
+        if: matrix.os == 'ubuntu-latest'
+        run: sudo apt-get install -y libjpeg-dev
+
       - name: Install MPF
         run: |
           pip install --upgrade pip setuptools wheel build coveralls

mpf/config_players/random_event_player.py

@@ -23,48 +23,44 @@ def is_entry_valid_outside_mode(settings) -> bool:
         """Return true if scope is not player."""
         return settings['scope'] != "player"
 
-    def _get_randomizer(self, settings, context, calling_context):
-        key = "random_{}.{}".format(context, calling_context)
-        if settings['scope'] == "player":
-            if not self.machine.game.player[key]:
-                self.machine.game.player[key] = Randomizer(
-                    settings['events'], self.machine, template_type="event")
-                r'''player_var: random_(x).(y)
+    def _build_randomizer(self, settings):
+        randomizer = Randomizer(settings['events'], self.machine, template_type="event")
+
+        if settings['force_all']:
+            randomizer.force_all = True
 
-                desc: Holds references to Randomizer settings that need to be
-                tracked on a player basis. There is nothing you need to know
-                or do with this, rather this is just FYI on what the player
-                variables that start with "random\_" are.
-                '''
+        if not settings['force_different']:
+            randomizer.force_different = False
 
-                if settings['force_all']:
-                    self.machine.game.player[key].force_all = True
+        if settings['disable_random']:
+            randomizer.disable_random = True
 
-                if not settings['force_different']:
-                    self.machine.game.player[key].force_different = False
+        randomizer.fallback_value = settings.get('fallback_event')
+        return randomizer
 
-                if settings['disable_random']:
-                    self.machine.game.player[key].disable_random = True
+    def _get_randomizer(self, settings, context, calling_context):
+        key = "random_{}.{}".format(context, calling_context)
+        if settings['scope'] == "player":
+            if not self.machine.game.player[key]:
+                self.machine.game.player[key] = self._build_randomizer(settings)
 
-                self.machine.game.player[key].fallback_value = settings.get('fallback_event')
+            '''player_var: random_(x).(y)
 
+            desc: Holds references to Randomizer settings that need to be
+            tracked on a player basis. There is nothing you need to know
+            or do with this, rather this is just FYI on what the player
+            variables that start with "random_" are.
+            '''
             return self.machine.game.player[key]
 
         if key not in self._machine_wide_dict:
-            self._machine_wide_dict[key] = Randomizer(
-                settings['events'], self.machine, template_type="event")
-
-            if settings['force_all']:
-                self._machine_wide_dict[key].force_all = True
-
-            if not settings['force_different']:
-                self._machine_wide_dict[key].force_different = False
-
-            if settings['disable_random']:
-                self._machine_wide_dict[key].disable_random = True
+            self._machine_wide_dict[key] = self._build_randomizer(settings)
 
-            self._machine_wide_dict[key].fallback_value = settings.get('fallback_event')
+        '''machine_var: random_(x).(y)
 
+        desc: Holds references to Randomizer settings that need to be
+        tracked on a machine basis.
+        '''
         return self._machine_wide_dict[key]
 
     def play(self, settings, context, calling_context, priority=0, **kwargs):

mpf/config_spec.yaml

@@ -566,6 +566,7 @@ fast_net:
     default_quick_debounce_close: single|ms|2
     default_normal_debounce_open: single|ms|4
     default_normal_debounce_close: single|ms|4
+    mute_unconfigured_switches: single|bool|false
     gi_hz: single|int|30
     lamp_hz: single|int|30
 fast_io_loop:
@@ -589,11 +590,11 @@ fast_exp_board:
 fast_breakout:
     port: single|enum(1,2,3)|
     model: single|str|
-    led_ports: list|subconfig(fast_led_port)|None
 fast_led_port:
-    port: single|str|
-    type: single|enum(ws2812,apa-102)|ws2812
-    leds: single|int|32
+    port: single|int|
+    type: single|enum(ws2812,apa-102,sk6812,mixed)|ws2812
+    count: single|int|32
+    rgbw_numbers: list|int|None  # only used with the "mixed" type
 fast_aud:
     port: list|str|auto
     baud: single|int|230400
@@ -913,6 +914,7 @@ counter_control_events:  # subconfig for mode counters
     action: single|enum(add,subtract,jump)|
     event: single|event_handler|
     value: single|template_int|None
+    priority: single|int|0
 sequences:
     __valid_in__: machine, mode
     __type__: device

mpf/core/mode_device.py

@@ -22,13 +22,13 @@ def __init__(self, machine: MachineController, name: str) -> None:
         self.mode = None    # type: Optional[Mode]
 
     async def device_added_to_mode(self, mode: Mode) -> None:
-        """Add device to a running mode.
+        """Add device to a loading mode.
 
         Args:
         ----
             mode: Mode which loaded the device
         """
-        del mode
+        self.mode = mode
         await self._initialize()
 
     def device_loaded_in_mode(self, mode: Mode, player: Player) -> None:
@@ -42,7 +42,7 @@ def device_loaded_in_mode(self, mode: Mode, player: Player) -> None:
             player: Current active player
         """
         del player
-        self.mode = mode
+        del mode
 
     @property
     def can_exist_outside_of_game(self) -> bool:
@@ -88,4 +88,3 @@ def device_removed_from_mode(self, mode: Mode) -> None:
             mode: Mode which stopped
         """
         del mode
-        self.mode = None

mpf/core/randomizer.py

@@ -1,5 +1,4 @@
 """Generic list randomizer."""
-from uuid import uuid4
 import random
 
 
@@ -13,13 +12,13 @@ def __init__(self, items, machine=None, template_type=None):
         self.force_different = True
         self.force_all = False
         self.disable_random = False
-        # self.loop - property which sets force_all=True if loop==False
         self.items = list()
 
+        # self.loop - property which sets force_all=True if loop==False
         self._loop = True
+
         self._template_type = template_type
         self.data = None
-        self._uuid = uuid4()
 
         if isinstance(items, (list, tuple)):
             for i in items: