mpf 0.80.0.dev7__tar.gz → 0.80.0.dev9__tar.gz

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/.github/workflows/build_wheels.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.11
+          python-version: 3.12
 
       - name: Install MPF
         run: |

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/.github/workflows/prospector.yml

@@ -6,7 +6,7 @@ jobs:
   prospector:
     name: Run Prospector on all Python files
     runs-on: ubuntu-latest
-    
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -14,6 +14,7 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v4
         with:
+          # Ubuntu can't run 3.12 because Pillow dependencies.
           python-version: 3.11
 
       - name: Install MPF

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/.github/workflows/run_tests.yml

@@ -18,6 +18,8 @@ jobs:
           python-version: "3.10"
         - os: windows-latest
           python-version: 3.11
+        - os: windows-latest
+          python-version: 3.12
         - os: ubuntu-latest
           python-version: 3.8
         - os: ubuntu-latest
@@ -26,6 +28,7 @@ jobs:
           python-version: "3.10"
         - os: ubuntu-latest
           python-version: 3.11
+        # Ubuntu can't run 3.12 because Pillow dependencies.
         - os: macos-latest
           python-version: 3.8
         - os: macos-latest
@@ -34,6 +37,8 @@ jobs:
           python-version: "3.10"
         - os: macos-latest
           python-version: 3.11
+        - os: macos-latest
+          python-version: 3.12
 
     steps:
       - name: Checkout MPF

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/AUTHORS.md

@@ -30,6 +30,7 @@ their spare time, unpaid, for the love of pinball!
  * Dave Ensminger <dave@ensadi.com>
  * Charles Duncan (nullbuilds)
  * Eric Selk <ericselk2018@gmail.com>
+ * Jerome Vivien
 
 MPF was inspired by pyprocgame which was written by:
 

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: mpf
-Version: 0.80.0.dev7
+Version: 0.80.0.dev9
 Summary: The Mission Pinball Framework (MPF)
 Author-email: The Mission Pinball Framework Team <brian@missionpinball.org>
 License: MIT
@@ -21,7 +21,7 @@ Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Topic :: Artistic Software
 Classifier: Topic :: Games/Entertainment :: Arcade
-Requires-Python: >=3.8
+Requires-Python: <3.13,>=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 License-File: AUTHORS.md
@@ -45,6 +45,8 @@ Provides-Extra: osc
 Requires-Dist: python-osc==1.8.3; extra == "osc"
 Provides-Extra: pin2dmd
 Requires-Dist: pyusb==1.1.0; extra == "pin2dmd"
+Provides-Extra: zedmd
+Requires-Dist: numpy>=1.7.0; extra == "zedmd"
 Provides-Extra: rpi
 Requires-Dist: apigpio-mpf==0.0.4; extra == "rpi"
 Provides-Extra: uvloop
@@ -67,6 +69,8 @@ Requires-Dist: grpcio_tools==1.34.0; extra == "all"
 Requires-Dist: grpcio==1.34.0; extra == "all"
 Requires-Dist: protobuf==3.14.0; extra == "all"
 Requires-Dist: uvloop==0.19.0; extra == "all"
+Requires-Dist: numpy>=1.7.0; extra == "all"
+Dynamic: license-file
 
 Mission Pinball Framework (MPF)
 ===============================

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/_version.py

@@ -10,7 +10,7 @@ PyPI.
 
 """
 
-__version__ = '0.80.0.dev7'
+__version__ = '0.80.0.dev9'
 '''The full version of MPF.'''
 
 __short_version__ = '0.80'
@@ -19,6 +19,9 @@ __short_version__ = '0.80'
 __bcp_version__ = '1.1'
 '''The version of BCP this build of MPF uses.'''
 
+__gmc_version__ = '0.1.5'
+'''The version of GMC this build of MPF requires.'''
+
 __config_version__ = '6'
 '''The config file version this build of MPF uses.'''
 

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/assets/show.py

@@ -114,7 +114,7 @@ class Show:
 
         if step_num < total_steps_num - 1 and 'time' in data[step_num + 1]:     # pragma: no cover
             self._show_validation_error("Found invalid 'time' entry in step after {} which contains a duration. "
-                                        "Remove either of them!".format(step_num), 2)
+                                        "Remove either of them!".format(step_num), 8)
         return Util.string_to_secs(step['duration'])
 
     def load(self, data: Optional[Dict]):

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/config_players/variable_player.py

@@ -42,7 +42,7 @@ class VariablePlayer(ConfigPlayer):
 
             if s['action'] not in ("set", "set_machine"):
                 self.raise_config_error('Cannot use add on subscriptions. '
-                                        'Use action set or set_machine.', 8, context=context)
+                                        'Use action set or set_machine.', 9, context=context)
 
             args = {"value": value}
 

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/config_spec.yaml

@@ -455,7 +455,7 @@ diverters:
     __type__: device
     activate_events: event_handler|event_handler:ms|None
     activation_coil: single|machine(coils)|None
-    activation_time: single|ms|0
+    activation_time: single|template_ms|None
     activation_switches: list|machine(switches)|None
     allow_multiple_concurrent_ejects_to_same_side: single|bool|true
     cool_down_time: single|ms|0
@@ -628,6 +628,7 @@ fast:
     __type__: config
     net: single|subconfig(fast_net)|None
     exp: single|subconfig(fast_exp)|None
+    exp_int: single|subconfig(fast_exp)|None    
     aud: single|subconfig(fast_aud)|None
     seg: single|subconfig(fast_seg)|None
     dmd: single|subconfig(fast_dmd)|None
@@ -2243,3 +2244,12 @@ window:
     top: single|int|None
     no_window: single|bool|false
     effects: ignore
+
+zedmd:
+    __valid_in__: machine
+    __type__: config_dict
+    console_log: single|enum(none,basic,full)|none
+    file_log: single|enum(none,basic,full)|basic
+    debug: single|bool|false
+    width: single|int|32
+    height: single|int|32

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/core/bcp/bcp_socket_client.py

@@ -6,7 +6,7 @@ import asyncio
 
 from typing import Tuple
 
-from mpf._version import __version__, __bcp_version__
+from mpf._version import __version__, __bcp_version__, __gmc_version__
 from mpf.core.bcp.bcp_client import BaseBcpClient
 
 BYTE_MARKER = b'&bytes='
@@ -348,7 +348,9 @@ class BCPClientSocket(BaseBcpClient):
         """Send BCP 'hello' command."""
         self.send('hello', {"version": __bcp_version__,
                             "controller_name": 'Mission Pinball Framework',
-                            "controller_version": __version__})
+                            "controller_version": __version__,
+                            "gmc_version": __gmc_version__,
+                            })
 
     def send_goodbye(self):
         """Send BCP 'goodbye' command."""

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/core/config_validator.py

@@ -335,7 +335,7 @@ class ConfigValidator:
 
                         raise ConfigFileError('Your config contains a value for "track" in '
                                               'setting "' + path_string + '", but "track" has '
-                                              'been replaced with "bus" in MPF 0.80.', 2, self.log.name)
+                                              'been replaced with "bus" in MPF 0.80.', 20, self.log.name)
 
                     else:
                         self.log.error('Your config contains a value for the '
@@ -601,7 +601,7 @@ class ConfigValidator:
             try:
                 return Util.string_to_secs(item)
             except ValueError:
-                raise self.validation_error(item, validation_failure_info, "Cannot convert value to secs.", 11)
+                raise self.validation_error(item, validation_failure_info, "Cannot convert value to secs.", 10)
 
         return None
 

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/core/service_controller.py

@@ -9,6 +9,7 @@ from collections import namedtuple
 from typing import List
 
 from mpf.core.mpf_controller import MpfController
+from mpf.devices.dual_wound_coil import DualWoundCoil
 
 SwitchMap = namedtuple("SwitchMap", ["board", "switch"])
 CoilMap = namedtuple("CoilMap", ["board", "coil"])
@@ -92,8 +93,10 @@ class ServiceController(MpfController):
         """Return a map of all coils in the machine."""
         coil_map = []
         for coil in self.machine.coils.values():
-            assert coil.hw_driver is not None
-            coil_map.append(CoilMap(coil.hw_driver.get_board_name(), coil))
+            if isinstance(coil, DualWoundCoil):
+                self.info_log("Coil mapping skipped dual-wound coil %s", coil.name)
+            else:
+                coil_map.append(CoilMap(coil.hw_driver.get_board_name(), coil))
 
         # sort by board + driver number
         if do_sort:

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/devices/ball_device/ball_device.py

@@ -315,25 +315,25 @@ class BallDevice(SystemWideDevice):
         if max(self.config['eject_timeouts'].values()) > min(
                 self.config['ball_missing_timeouts'].values()):
             self.raise_config_error('Configuration error in {} ball device. '
-                                    'all ball_missing_timeouts have to be larger '
+                                    'All ball_missing_timeouts have to be larger '
                                     'than all eject_timeouts'.
                                     format(self.name), 8)
 
         # all ball_missing_timeouts < incoming ball timeout
         if max(self.config['ball_missing_timeouts'].values()) > 60000:
             self.raise_config_error('Configuration error in {} ball device. '
-                                    'incoming ball timeout has to be larger '
+                                    'Incoming ball timeout has to be larger '
                                     'than all ball_missing_timeouts'.
                                     format(self.name), 9)
 
         if (self.config['confirm_eject_type'] == "switch" and
                 not self.config['confirm_eject_switch']):
-            self.raise_config_error("When using confirm_eject_type switch you " +
+            self.raise_config_error("When using confirm_eject_type switch you need " +
                                     "to specify a confirm_eject_switch", 7)
 
         if (self.config['confirm_eject_type'] == "event" and
                 not self.config['confirm_eject_event']):
-            self.raise_config_error("When using confirm_eject_type event you " +
+            self.raise_config_error("When using confirm_eject_type event you need " +
                                     "to specify a confirm_eject_event", 14)
 
         if "ball_add_live" in self.tags:

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/devices/ball_device/switch_counter.py

@@ -56,7 +56,7 @@ class SwitchCounter(PhysicalBallCounter):
         if self.config['exit_count_delay'] > min(
                 self.ball_device.config['eject_timeouts'].values()):
             self.ball_device.raise_config_error('Configuration error in {} ball device. '
-                                                'all eject_timeouts have to be larger than '
+                                                'All eject_timeouts have to be larger than '
                                                 'exit_count_delay'.
                                                 format(self.ball_device.name), 6)
 
@@ -64,7 +64,7 @@ class SwitchCounter(PhysicalBallCounter):
         if self.config['entrance_count_delay'] > min(
                 self.ball_device.config['eject_timeouts'].values()):
             self.ball_device.raise_config_error('Configuration error in {} ball device. '
-                                                'all eject_timeouts have to be larger than '
+                                                'All eject_timeouts have to be larger than '
                                                 'entrance_count_delay'.
                                                 format(self.ball_device.name), 7)
 

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/devices/diverter.py

@@ -258,7 +258,7 @@ class Diverter(SystemWideDevice):
     def schedule_deactivation(self):
         """Schedule a delay to deactivate this diverter."""
         if self.config['activation_time']:
-            self.delay.add(name='deactivate_timed', ms=self.config['activation_time'],
+            self.delay.add(name='deactivate_timed', ms=self.config['activation_time'].evaluate({}),
                            callback=self.deactivate)
 
     def _enable_switches(self):

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/devices/shot.py

@@ -425,8 +425,8 @@ class Shot(EnableDisableMixin, ModeDevice):
     def _register_control_event_handlers(self):
         for control_event in self.config['control_events']:
             for event in control_event['events']:
-                self._handlers.append(self.machine.events.add_handler(event, self._control_events,
-                                                                      control_event_config=control_event))
+                self.machine.events.add_handler(event, self._control_events,
+                                                control_event_config=control_event)
 
     @event_handler(7)
     def _control_events(self, control_event_config, **kwargs):

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/modes/high_score/config/high_score.yaml

@@ -7,7 +7,7 @@ mode:
   use_wait_queue: true
 
 # Instructions on how to use this mode:
-# https://missionpinball.org/game_logic/high_scores
+# https://missionpinball.org/latest/game_logic/high_scores
 
 high_score:
   enter_initials_timeout: 60
@@ -27,6 +27,17 @@ high_score:
       - QC: 42
       - MPF: 23
 
+event_player:
+  sw_left_flipper_active:
+    text_input:
+      action: left
+  sw_right_flipper_active:
+    text_input:
+      action: right
+  sw_start_active:
+    text_input:
+      action: select
+
 slide_player:
   high_score_enter_initials:
     high_score:

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/modes/tilt/config/tilt.yaml

@@ -7,7 +7,7 @@ mode:
   stop_on_ball_end: False
 
 # Instructions on how to use this mode:
-# https://missionpinball.org/game_logic/tilt
+# https://missionpinball.org/latest/game_logic/tilt
 
 tilt:
   tilt_warning_switch_tag: tilt_warning
@@ -19,30 +19,22 @@ tilt:
   tilt_warnings_player_var: tilt_warnings
 
 slide_player:
-  tilt_warning_1: tilt_warning_1
-  tilt_warning_2: tilt_warning_2
-  tilt: tilt
-  tilt_clear:
-    tilt:
-      action: remove
-slides:
   tilt_warning_1:
-    widgets:
-    - type: text
-      text: WARNING
-    expire: 1s
+    tilt:
+      expire: 1s
+      tokens:
+        text: WARNING
   tilt_warning_2:
-    widgets:
-    - type: text
-      text: WARNING
-      y: top-2
-      anchor_y: top
-    - type: text
-      text: WARNING
-      y: top-18
-      anchor_y: top
+    tilt:
       expire: 1s
-    expire: 2s
+      tokens:
+        text: DANGER
   tilt:
-  - type: text
-    text: TILT
+    tilt:
+      action: play
+      tokens:
+        text: TILT
+
+  tilt_clear:
+    tilt:
+      action: remove

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/mpfconfig.yaml

@@ -138,6 +138,7 @@ mpf:
         light_segment_displays: mpf.platforms.light_segment_displays.LightSegmentDisplaysPlatform
         pin2dmd: mpf.platforms.pin2dmd.Pin2DmdHardwarePlatform
         visual_pinball_engine: mpf.platforms.visual_pinball_engine.visual_pinball_engine.VisualPinballEnginePlatform
+        zedmd: mpf.platforms.zedmd.ZeDmdPlatform
 
     paths:
         audits: data/audits.yaml

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/platforms/fast/fast.py

@@ -45,7 +45,7 @@ class FastHardwarePlatform(ServoPlatform, LightsPlatform, RgbDmdPlatform,
                  "io_boards", "io_boards_by_name", "switches_initialized",
                  "drivers_initialized", "audio_interface"]
 
-    port_types = ['net', 'exp', 'aud', 'dmd', 'rgb', 'seg', 'emu']
+    port_types = ['net', 'exp', 'exp_int', 'aud', 'dmd', 'rgb', 'seg', 'emu']
 
     def __init__(self, machine):
         """Initialize FAST hardware platform.
@@ -79,7 +79,7 @@ class FastHardwarePlatform(ServoPlatform, LightsPlatform, RgbDmdPlatform,
         elif self.machine_type == 'no_net':
             pass
         else:
-            self.raise_config_error(f'Unknown machine_type "{self.machine_type}" configured fast.', 6)
+            self.raise_config_error(f'Unknown machine_type "{self.machine_type}" could not be configured by FAST.', 6)
 
         # Even though System11 uses ticks, that's handled on the Overlay and not needed here.
         self.features['tickless'] = True
@@ -247,6 +247,11 @@ class FastHardwarePlatform(ServoPlatform, LightsPlatform, RgbDmdPlatform,
                     FastExpCommunicator
                 communicator = FastExpCommunicator(platform=self, processor=port, config=config)
                 self.serial_connections['exp'] = communicator
+            elif port == 'exp_int':
+                from mpf.platforms.fast.communicators.exp import \
+                    FastExpCommunicator
+                communicator = FastExpCommunicator(platform=self, processor=port, config=config)
+                self.serial_connections['exp_int'] = communicator
             elif port == 'seg':
                 from mpf.platforms.fast.communicators.seg import \
                     FastSegCommunicator
@@ -663,9 +668,8 @@ class FastHardwarePlatform(ServoPlatform, LightsPlatform, RgbDmdPlatform,
 
         if device_num > devices_per_port:
             if name:
-                # TODO get a final error code
                 self.raise_config_error(f"Device number {device_num} exceeds the number of devices per port "
-                                        f"({devices_per_port}) for LED {name}", 8)
+                                        f"({devices_per_port}) for LED {name}", 9)
             else:
                 raise AssertionError(f"Device number {device_num} exceeds the number of devices per port "
                                      f"({devices_per_port})")

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/platforms/fast/fast_driver.py

@@ -103,7 +103,7 @@ class FASTDriver:
         if mpf_config.default_pulse_ms > 255:
             raise ConfigFileError("FAST platform does not support default_pulse_ms > 255. Use "
                                   f"platform_settings:pwm2_ms which goes up to 25,500ms. Coil '{mpf_config.name}'.",
-                                  7, self.log.name)
+                                  8, self.log.name)
 
         pwm2_ms, pwm2_power, recycle_ms = self._get_platform_settings(mpf_config, platform_settings)
 

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/platforms/fast/fast_exp_board.py

@@ -122,10 +122,6 @@ class FastExpansionBoard:
                                            f'Actual: {firmware_version}. Update at fastpinball.com/firmware')
 
             brk = self.breakouts[brk_board]
-
-            if product_id != brk.model:
-                raise AssertionError(f'EXP Board {self}, Breakout Port {brk.index}: '
-                                     f'Config is set for {brk.model}, but actually found "{id_string}"')
             brk.hw_verified = True
 
         else:

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/platforms/fast/fast_port_detector.py

@@ -82,7 +82,7 @@ class FastPortDetector:
                 try:
                     data = await asyncio.wait_for(reader.read(100), timeout=1.0)
                 except asyncio.TimeoutError:
-                    pass
+                    data = None
 
                 if data:
                     data = data.decode('utf-8', errors='ignore')

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/platforms/opp/opp_modern_lights.py

@@ -80,8 +80,8 @@ class OPPModernLightChannel(PlatformBatchLight):
 
     def get_board_name(self):
         """Return OPP chain and addr."""
-        return "OPP Light {} on Chain {} Board {} Type {}".format(
-            self.pixel_num, self.chain_serial, self.addr, self.get_type_string())
+        return "OPP Chain {} Board {} Type {}".format(
+            self.chain_serial, self.addr, self.get_type_string())
 
     def is_successor_of(self, other):
         """Return true if the other light has the previous pixel_num and is on the same chain and addr."""

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/platforms/pkone/pkone_lights.py

@@ -89,11 +89,9 @@ class PKONELEDChannel(PlatformBatchLight):
 
     def get_board_name(self):
         """Return the board of this light."""
-        return "PKONE LED Channel {} on Lightshow Board (Address ID {}, Group {}, Light: {}, " \
-               "Hardware Aligned: {})".format(self.index,
-                                              self.board_address_id,
+        return "PKONE Lightshow Board (Address ID {}, Group {}, " \
+               "Hardware Aligned: {})".format(self.board_address_id,
                                               self.group,
-                                              self.config.name,
                                               "Yes" if self._hardware_aligned else "No")
 
     def is_successor_of(self, other):

{mpf-0.80.0.dev7 → mpf-0.80.0.dev9}/mpf/platforms/virtual.py

@@ -119,7 +119,7 @@ class VirtualHardwarePlatform(AccelerometerPlatform, I2cPlatform, ServoPlatform,
                         if " " in switch_name:
                             self.raise_config_error("MPF no longer supports lists separated by space in "
                                                     "virtual_platform_start_active_switches. Please separate "
-                                                    "switches by comma: {}.".format(switch_name), 1)
+                                                    "switches by comma: {}.".format(switch_name), 2)
                         else:
                             self.raise_config_error("Switch {} used in virtual_platform_start_active_switches was not "
                                                     "found in switches section.".format(switch_name), 1)
@@ -497,14 +497,29 @@ class VirtualLight(LightPlatformInterface):
 
     def is_successor_of(self, other):
         """Return true if the other light has the same number string plus the suffix '+1'."""
-        return self.number == other.number + "+1"
+        self_addr, self_offset = VirtualLight.split_light_address(self.number)
+        other_addr, other_offset = VirtualLight.split_light_address(other.number)
+        return self_addr == other_addr and int(self_offset) == int(other_offset) + 1
 
     def get_successor_number(self):
         """Return the number with the suffix '+1'.
 
         As there is not real number format for virtual is this is all we can do here.
         """
-        return self.number + "+1"
+        addr, offset = VirtualLight.split_light_address(self.number)
+        return f"{addr}+{int(offset) + 1}"
+
+    @staticmethod
+    def split_light_address(address):
+        """Return a light address (without 'led-' prefix) and an offset number as a list.
+
+        Used when calculating relative light addresses,
+        e.g. led-2-0-1 -> led-2-0-1+1 -> led-2-0-1+2
+        """
+        address = address.replace("led-", "")
+        if "+" in address:
+            return address.rsplit("+", 1)
+        return (address, '0')
 
     def __lt__(self, other):
         """Order lights by string."""