mpf 0.81.0.dev1__tar.gz → 0.81.0.dev2__tar.gz

{mpf-0.81.0.dev1 → mpf-0.81.0.dev2}/.github/workflows/build_wheels.yml

@@ -17,10 +17,10 @@ jobs:
 
     steps:
       - name: Checkout MPF
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.13
 
@@ -38,7 +38,7 @@ jobs:
       - name: Build wheel
         run: python -m build
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           path: ./dist/*.*
 

{mpf-0.81.0.dev1 → mpf-0.81.0.dev2}/.github/workflows/prospector.yml

@@ -23,10 +23,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
 
       - name: Setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: 3.13
 

{mpf-0.81.0.dev1 → mpf-0.81.0.dev2}/.github/workflows/run_tests.yml

@@ -4,11 +4,17 @@ on:
   push:
     branches:
       - dev
+      - 0.57.x
+      - 0.58.x
       - 0.80.x
+      - 0.81.x
   pull_request:
     branches:
       - dev
+      - 0.57.x
+      - 0.58.x
       - 0.80.x
+      - 0.81.x
 
 jobs:
   tests:
@@ -53,10 +59,10 @@ jobs:
 
     steps:
       - name: Checkout MPF
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: Setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
 

{mpf-0.81.0.dev1 → mpf-0.81.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mpf
-Version: 0.81.0.dev1
+Version: 0.81.0.dev2
 Summary: The Mission Pinball Framework (MPF)
 Author-email: The Mission Pinball Framework Team <brian@missionpinball.org>
 License: MIT

{mpf-0.81.0.dev1 → mpf-0.81.0.dev2}/mpf/_version.py

@@ -10,7 +10,7 @@ PyPI.
 
 """
 
-__version__ = '0.81.0.dev1'
+__version__ = '0.81.0.dev2'
 '''The full version of MPF.'''
 
 __short_version__ = '0.81'

{mpf-0.81.0.dev1 → mpf-0.81.0.dev2}/mpf/devices/magnet.py

@@ -9,7 +9,7 @@ from mpf.core.device_monitor import DeviceMonitor
 from mpf.core.system_wide_device import SystemWideDevice
 
 
-@DeviceMonitor(_active="active", _release_in_progress="release_in_progress", _enabled="enabled")
+@DeviceMonitor(_active="active", _release_in_progress="release_in_progress", enabled="enabled")
 class Magnet(EnableDisableMixinSystemWideDevice, SystemWideDevice):
 
     """Controls a playfield magnet in a pinball machine."""

{mpf-0.81.0.dev1 → mpf-0.81.0.dev2}/mpf/modes/match/code/match.py

@@ -18,10 +18,11 @@ class Match(AsyncMode):
         """Initialize match mode."""
         super().__init__(*args, **kwargs)
         # add setting
-        self.machine.settings.add_setting(SettingEntry("match_percentage", "Match Percentage", 500,
-                                                       "match_percentage", 10,
-                                                       {0: "Never", 2: "2%", 5: "5%", 10: "10%", 15: "15%", 30: "30%",
-                                                        50: "50%"}, "standard"))
+        self.machine.settings.add_setting(
+            SettingEntry("match_percentage",
+                         "Match Percentage", 500, "match_percentage", 10,
+                         {0: "Never", 2: "2%", 5: "5%", 10: "10%", 15: "15%", 30: "30%", 50: "50%"},
+                         "standard"))
 
     def _get_match_numbers(self):
         """Calculate match numbers."""
@@ -66,7 +67,12 @@ class Match(AsyncMode):
         self.machine.variables.set_machine_var('match_number', winner_number)
 
         for i in range(0, self.machine.game.max_players):
-            event_args["match_number{}".format(i)] = match_numbers[i] if len(match_numbers) > i else ""
+            player_value = ""
+            if len(match_numbers) > i:
+                player_value = match_numbers[i]
+
+            event_args["match_number{}".format(i)] = player_value
+            event_args["match_number{}_won".format(i)] = player_value == winner_number
 
         if not winners:
             # no winner
@@ -80,7 +86,9 @@ class Match(AsyncMode):
               winners: Number of winners (always 0 here)
               match_number0: Match number for player 0
               match_number1: Match number for player 1
+              match_number1_won: True/False for if player 1 matched
               match_numberX: Match number for player X (up to max players)
+              match_numberX_won: T/F for if player X matched (up to max players)
             '''
         else:
             # we got a winner
@@ -94,6 +102,8 @@ class Match(AsyncMode):
               winners: Number of winners (always more than 0 here)
               match_number0: Match number for player 0
               match_number1: Match number for player 1
+              match_number1_won: True/False for if player 1 matched
               match_numberX: Match number for player X (up to max players)
+              match_numberX_won: T/F for if player X matched (up to max players)
             '''
         # that is it. credits mode should hook into the match_has_match event and award credits

{mpf-0.81.0.dev1 → mpf-0.81.0.dev2}/mpf/parsers/event_reference_parser.py

@@ -31,15 +31,19 @@ class EventReferenceParser:
                 class_label = None
                 config_section = None
                 for statement in x.body:
-                    if isinstance(statement, ast.Assign) and len(statement.targets) == 1 and \
-                       isinstance(statement.targets[0], ast.Name) and isinstance(statement.value, ast.Str):
+                    if (isinstance(statement, ast.Assign)
+                            and len(statement.targets) == 1
+                            and isinstance(statement.targets[0], ast.Name)
+                            and isinstance(statement.value, ast.Constant)
+                            and isinstance(statement.value.value, str)):
                         if statement.targets[0].id == "class_label":
-                            class_label = str(statement.value.s)
+                            class_label = str(statement.value.value)
                         elif statement.targets[0].id == "config_section":
-                            config_section = [str(statement.value.s)]
+                            config_section = [str(statement.value.value)]
 
                 for y in ast.walk(x):
-                    if not (isinstance(y, ast.Str) and (y.s.strip().lower().startswith('event:'))):
+                    if not (isinstance(y, ast.Constant) and isinstance(y.value, str)
+                            and y.value.strip().lower().startswith('event:')):
                         continue
 
                     event_dict = self._parse_string(y)
@@ -60,7 +64,7 @@ class EventReferenceParser:
 
     def _parse_string(self, string):
         string = '\n'.join(' '.join(line.split())
-                           for line in string.s.split('\n'))
+                           for line in string.value.split('\n'))
 
         string = string.replace('Event:', 'event:')
         string = string.replace('Desc:', 'desc:')

{mpf-0.81.0.dev1 → mpf-0.81.0.dev2}/mpf/platforms/virtual_pinball/virtual_pinball.py

@@ -1,5 +1,6 @@
 """VPX platform."""
 import asyncio
+import inspect
 from typing import Dict, List, Optional
 
 import logging
@@ -200,6 +201,8 @@ class VirtualPinballPlatform(LightsPlatform, SwitchPlatform, DriverPlatform, Seg
 
         try:
             result = method(**kwargs)
+            if inspect.iscoroutine(result):
+                result = await result
         # pylint: disable-msg=broad-except
         except Exception as e:
             self.machine.bcp.transport.send_to_client(client, "vpcom_bridge_response",
@@ -212,6 +215,24 @@ class VirtualPinballPlatform(LightsPlatform, SwitchPlatform, DriverPlatform, Seg
         self._started.set()
         return True
 
+    async def vpx_reset(self):
+        """Wipe platform-side switch mirror and reset the machine.
+
+        Called by the VPX plugin on every (re)connect to give VPX a clean
+        MPF to talk to. Mechanisms (servos, motors, drop targets, diverters)
+        auto-reset because they subscribe to machine_reset_phase_3.
+
+        Order matters: clear switches first so reset-phase handlers see the
+        cleaned state instead of stale readings from the prior VPX session.
+        """
+        for num, sw in list(self._switches.items()):
+            if sw.state:
+                sw.state = False
+                self.machine.switch_controller.process_switch_by_num(
+                    state=0, num=num, platform=self)
+        await self.machine.reset()
+        return True
+
     def vpx_get_switch(self, number):
         """Return switch value."""
         # pylint: disable-msg=no-else-return

{mpf-0.81.0.dev1 → mpf-0.81.0.dev2}/mpf/tests/test_MatchMode.py

@@ -45,11 +45,19 @@ class TestMatchMode(MpfFakeGameTestCase):
 
         with patch("mpf.modes.match.code.match.random.randint") as randint:
             randint.return_value = 50
-            self.drain_all_balls()
-            self.advance_time_and_run()
+
+            with patch("mpf.modes.match.code.match.random.choice") as choice:
+                choice.return_value = 10
+
+                self.drain_all_balls()
+                self.advance_time_and_run()
+
         self.assertGameIsNotRunning()
-        self.assertEventCalled("match_no_match")
         self.assertEventNotCalled("match_has_match")
+        queue_cheat = self._last_event_kwargs["match_no_match"]['queue']  # workaround to skip checking event kwarg
+        self.assertEventCalledWith("match_no_match", winner_number=10, winners=0, queue=queue_cheat,
+            match_number0=37, match_number1='', match_number2='', match_number3='',
+            match_number0_won=False, match_number1_won=False, match_number2_won=False, match_number3_won=False)
 
         self.assertMachineVarEqual(0, "credits_whole_num")
 
@@ -71,6 +79,10 @@ class TestMatchMode(MpfFakeGameTestCase):
             self.advance_time_and_run()
         self.assertGameIsNotRunning()
         self.assertEventNotCalled("match_no_match")
-        self.assertEventCalled("match_has_match")
+
+        queue_cheat = self._last_event_kwargs["match_has_match"]['queue']  # workaround to skip checking event kwarg
+        self.assertEventCalledWith("match_has_match", winner_number=37, winners=1, queue=queue_cheat,
+            match_number0=37, match_number1='', match_number2='', match_number3='',
+            match_number0_won=True, match_number1_won=False, match_number2_won=False, match_number3_won=False)
 
         self.assertMachineVarEqual(1, "credits_whole_num")

{mpf-0.81.0.dev1 → mpf-0.81.0.dev2}/mpf/tests/test_VPX.py

@@ -132,3 +132,74 @@ class TestVPX(MpfTestCase):
         self.advance_time_and_run(.1)
         self.read_vpx_response_from_bcp()
         self.assertSwitchState("s_test", False)
+
+    def test_vpx_reset_clears_switches_and_resets_machine(self):
+        """vpx_reset wipes platform switch mirror, drives machine.reset(),
+        and replies with result=ok."""
+        self.advance_time_and_run()
+        self.client.send_queue = asyncio.Queue()
+
+        platform = self.machine.hardware_platforms['virtual_pinball']
+
+        # Pre-condition: set two switches active via the platform handler the
+        # plugin uses (so switch_controller stays consistent).
+        platform.vpx_set_switch("0", True)   # s_sling
+        platform.vpx_set_switch("3", True)   # s_flipper
+        self.advance_time_and_run(.1)
+        self.assertTrue(platform._switches["0"].state)
+        self.assertTrue(platform._switches["3"].state)
+        self.assertSwitchState("s_sling", True)
+
+        # Track that machine_reset_phase_3 fires (proxy for machine.reset() running).
+        reset_fired = []
+        self.machine.events.add_handler(
+            "machine_reset_phase_3", lambda **kwargs: reset_fired.append(True))
+
+        # Action.
+        self._encode_and_send("reset")
+        self.advance_time_and_run(.5)
+
+        # Reply check: result=ok, no error.
+        result = self.read_vpx_response_from_bcp()
+        self.assertIsNotNone(result)
+
+        # Switch mirror cleared.
+        self.assertFalse(platform._switches["0"].state)
+        self.assertFalse(platform._switches["3"].state)
+        self.assertSwitchState("s_sling", False)
+        self.assertSwitchState("s_flipper", False)
+
+        # machine.reset() ran.
+        self.assertTrue(reset_fired, "machine_reset_phase_3 was not posted")
+
+    def test_vpx_reset_ends_active_game(self):
+        """vpx_reset ends a game in progress (returns to attract mode)."""
+        self.advance_time_and_run()
+        self.client.send_queue = asyncio.Queue()
+
+        # Skip if the fixture can't actually run a game (no game mode, or no
+        # playfield source device for ball delivery). In-progress-game-ends
+        # behavior is covered by MPF's existing machine.reset() suite.
+        if 'game' not in self.machine.modes:
+            self.skipTest("VPX test fixture has no game mode")
+        if not any(getattr(pf, 'config', {}).get('default_source_device')
+                   for pf in self.machine.playfields):
+            self.skipTest("VPX test fixture has no playfield source device; "
+                          "cannot start a game in this fixture")
+
+        # Start a game by posting the game_start event.
+        self.machine.events.post('game_start')
+        self.advance_time_and_run(1)
+        self.assertIsNotNone(
+            self.machine.game,
+            "Setup precondition failed: game did not start")
+
+        # Reset.
+        self._encode_and_send("reset")
+        self.advance_time_and_run(.5)
+        self.read_vpx_response_from_bcp()
+
+        # Game ended; machine is back in attract.
+        self.assertIsNone(
+            self.machine.game,
+            "vpx_reset did not end the active game")

{mpf-0.81.0.dev1 → mpf-0.81.0.dev2}/mpf.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mpf
-Version: 0.81.0.dev1
+Version: 0.81.0.dev2
 Summary: The Mission Pinball Framework (MPF)
 Author-email: The Mission Pinball Framework Team <brian@missionpinball.org>
 License: MIT

{mpf-0.81.0.dev1 → mpf-0.81.0.dev2}/mpf.egg-info/SOURCES.txt

@@ -448,10 +448,10 @@ mpf/platforms/pinproc/windows/pinproc.cp311-win32.pyd
 mpf/platforms/pinproc/windows/pinproc.cp311-win_amd64.pyd
 mpf/platforms/pinproc/windows/pinproc.cp312-win32.pyd
 mpf/platforms/pinproc/windows/pinproc.cp312-win_amd64.pyd
-mpf/platforms/pinproc/windows/pinproc.cp38-win32.pyd
-mpf/platforms/pinproc/windows/pinproc.cp38-win_amd64.pyd
-mpf/platforms/pinproc/windows/pinproc.cp39-win32.pyd
-mpf/platforms/pinproc/windows/pinproc.cp39-win_amd64.pyd
+mpf/platforms/pinproc/windows/pinproc.cp313-win32.pyd
+mpf/platforms/pinproc/windows/pinproc.cp313-win_amd64.pyd
+mpf/platforms/pinproc/windows/pinproc.cp314-win32.pyd
+mpf/platforms/pinproc/windows/pinproc.cp314-win_amd64.pyd
 mpf/platforms/pkone/__init__.py
 mpf/platforms/pkone/pkone.py
 mpf/platforms/pkone/pkone_coil.py