mpf 0.57.3.dev3__tar.gz → 0.57.4__tar.gz

{mpf-0.57.3.dev3 → mpf-0.57.4}/.github/workflows/build_wheels.yml

@@ -17,15 +17,16 @@ jobs:
 
     steps:
       - name: Checkout MPF
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          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
           pip install -e .
 
@@ -35,7 +36,7 @@ jobs:
       - name: Build wheel
         run: python -m build
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: ./dist/*.*
 

{mpf-0.57.3.dev3 → mpf-0.57.4}/.github/workflows/prospector.yml

@@ -1,12 +1,21 @@
 name: Lint all Python files
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - dev
+      - 0.80.x
+  pull_request:
+    branches:
+      - dev
+      - 0.80.x
+
 
 jobs:
   prospector:
     name: Run Prospector on all Python files
     runs-on: ubuntu-latest
-    
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -14,10 +23,11 @@ jobs:
       - name: Setup python
         uses: actions/setup-python@v4
         with:
-          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 .
 

{mpf-0.57.3.dev3 → mpf-0.57.4}/.github/workflows/run_tests.yml

@@ -1,6 +1,14 @@
 name: Test on all platforms
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - dev
+      - 0.80.x
+  pull_request:
+    branches:
+      - dev
+      - 0.80.x
 
 jobs:
   tests:
@@ -18,6 +26,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 +36,8 @@ jobs:
           python-version: "3.10"
         - os: ubuntu-latest
           python-version: 3.11
+        - os: ubuntu-latest
+          python-version: 3.12
         - os: macos-latest
           python-version: 3.8
         - os: macos-latest
@@ -34,6 +46,8 @@ jobs:
           python-version: "3.10"
         - os: macos-latest
           python-version: 3.11
+        - os: macos-latest
+          python-version: 3.12
 
     steps:
       - name: Checkout MPF
@@ -44,6 +58,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-0.57.3.dev3 → mpf-0.57.4}/.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-0.57.3.dev3 → mpf-0.57.4}/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.57.3.dev3 → mpf-0.57.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: mpf
-Version: 0.57.3.dev3
+Version: 0.57.4
 Summary: The Mission Pinball Framework (MPF)
 Author-email: The Mission Pinball Framework Team <brian@missionpinball.org>
 License: MIT
@@ -14,13 +14,14 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Natural Language :: English
 Classifier: Operating System :: MacOS :: MacOS X
 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
@@ -31,6 +32,7 @@ Requires-Dist: psutil==5.9.8
 Requires-Dist: pyserial==3.5
 Requires-Dist: pyserial-asyncio==0.6
 Requires-Dist: ruamel.yaml==0.18.6
+Requires-Dist: setuptools~=72.2.0
 Requires-Dist: sortedcontainers==2.4.0
 Requires-Dist: terminaltables==3.1.10
 Requires-Dist: Pillow==9.5.0
@@ -44,6 +46,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
@@ -66,11 +70,13 @@ 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)
 ===============================
 
-<img align="center" height="146" src="https://missionpinball.org/images/mpf-logo-full.png"/>
+<img align="center" height="146" src="https://missionpinball.org/latest/images/mpf-logo-full.png"/>
 
 <em>...Let's build a pinball machine!</em>
 
@@ -94,7 +100,7 @@ Documentation
 Support
 -------
 
-MPF is an open source community project which has no official support. Some MPF users participate in the MPF-Users Google group or GitHub Discussion. Links [here](https://missionpinball.org/community/).
+MPF is an open source community project which has no official support. Some MPF users participate in the MPF-Users Google group or GitHub Discussion. Links [here](https://missionpinball.org/latest/community/).
 
 Individual pinball hardware companies may provide additional support for users of their hardware, often via their own Slack, Discord, or other chat groups. If you get stuck, you can ask for help in the MPF-users group, or you reach out to your hardware provider.
 
@@ -103,15 +109,15 @@ Maintenance, Pull Requests, & Bug Fixes
 
 As a community project, we welcome pull requests and bug fixes. However, we do not have the resources to provide support for MPF. If you are interested in becoming a maintainer, please contact us at brian@missionpinball.org.
 
-Bugs or other issues related to MPF itself can be posted to the [MPF Discussions page on GitHub](https://missionpinball.org/community/).
+Bugs or other issues related to MPF itself can be posted to the [MPF Discussions page on GitHub](https://missionpinball.org/latest/community/).
 
 Contributing
 ------------
 
 Individual pinball hardware makers are responsible for their own platform interface maintenance and contributions.
 
-MPF is a passion project created and maintained by volunteers. If you're a Python coder, documentation writer, or pinball maker, feel free to make a change and submit a pull request. For more information about contributing see the [Contributing Code](https://missionpinball.org/about/contributing_to_mpf/)
-and [Contributing Documentation](https://missionpinball.org/about/help_docs/) pages.
+MPF is a passion project created and maintained by volunteers. If you're a Python coder, documentation writer, or pinball maker, feel free to make a change and submit a pull request. For more information about contributing see the [Contributing Code](https://missionpinball.org/latest/about/contributing_to_mpf/)
+and [Contributing Documentation](https://missionpinball.org/latest/about/help_docs/) pages.
 
 License
 -------

{mpf-0.57.3.dev3 → mpf-0.57.4}/README.md

@@ -1,7 +1,7 @@
 Mission Pinball Framework (MPF)
 ===============================
 
-<img align="center" height="146" src="https://missionpinball.org/images/mpf-logo-full.png"/>
+<img align="center" height="146" src="https://missionpinball.org/latest/images/mpf-logo-full.png"/>
 
 <em>...Let's build a pinball machine!</em>
 
@@ -25,7 +25,7 @@ Documentation
 Support
 -------
 
-MPF is an open source community project which has no official support. Some MPF users participate in the MPF-Users Google group or GitHub Discussion. Links [here](https://missionpinball.org/community/).
+MPF is an open source community project which has no official support. Some MPF users participate in the MPF-Users Google group or GitHub Discussion. Links [here](https://missionpinball.org/latest/community/).
 
 Individual pinball hardware companies may provide additional support for users of their hardware, often via their own Slack, Discord, or other chat groups. If you get stuck, you can ask for help in the MPF-users group, or you reach out to your hardware provider.
 
@@ -34,15 +34,15 @@ Maintenance, Pull Requests, & Bug Fixes
 
 As a community project, we welcome pull requests and bug fixes. However, we do not have the resources to provide support for MPF. If you are interested in becoming a maintainer, please contact us at brian@missionpinball.org.
 
-Bugs or other issues related to MPF itself can be posted to the [MPF Discussions page on GitHub](https://missionpinball.org/community/).
+Bugs or other issues related to MPF itself can be posted to the [MPF Discussions page on GitHub](https://missionpinball.org/latest/community/).
 
 Contributing
 ------------
 
 Individual pinball hardware makers are responsible for their own platform interface maintenance and contributions.
 
-MPF is a passion project created and maintained by volunteers. If you're a Python coder, documentation writer, or pinball maker, feel free to make a change and submit a pull request. For more information about contributing see the [Contributing Code](https://missionpinball.org/about/contributing_to_mpf/)
-and [Contributing Documentation](https://missionpinball.org/about/help_docs/) pages.
+MPF is a passion project created and maintained by volunteers. If you're a Python coder, documentation writer, or pinball maker, feel free to make a change and submit a pull request. For more information about contributing see the [Contributing Code](https://missionpinball.org/latest/about/contributing_to_mpf/)
+and [Contributing Documentation](https://missionpinball.org/latest/about/help_docs/) pages.
 
 License
 -------

{mpf-0.57.3.dev3 → mpf-0.57.4}/mpf/_version.py

@@ -10,7 +10,7 @@ PyPI.
 
 """
 
-__version__ = '0.57.3.dev3'  # Also consider whether MPF-MC pyproject.toml should be updated
+__version__ = '0.57.4'  # Also consider whether MPF-MC pyproject.toml should be updated
 '''The full version of MPF.'''
 
 __short_version__ = '0.57'

{mpf-0.57.3.dev3 → mpf-0.57.4}/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.57.3.dev3 → mpf-0.57.4}/mpf/config_players/random_event_player.py

@@ -23,48 +23,44 @@ class RandomEventPlayer(ConfigPlayer):
         """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-0.57.3.dev3 → mpf-0.57.4}/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.57.3.dev3 → mpf-0.57.4}/mpf/config_spec.yaml

@@ -449,7 +449,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
@@ -622,6 +622,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
@@ -643,6 +644,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:
@@ -748,6 +750,9 @@ fast_servos:
     min_us: single|int|1000
     home_us: single|int|1500
     max_runtime: single|ms|2000  # 65535 max
+fast_stepper_settings:
+    __valid_in__: machine                 # todo add to validator
+    default_speed: single|int|600
 file_shows:
     __valid_in__: machine, mode                      # todo add to validator
     __type__: config_dict
@@ -808,6 +813,7 @@ hardware:
     accelerometers: list|str|default
     i2c: list|str|default
     stepper_controllers: list|str|default
+    shaker_controllers: list|str|default
     hardware_sound_system: list|str|default
 hardware_sound_systems:
     __valid_in__: machine
@@ -1018,6 +1024,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
@@ -1117,7 +1124,7 @@ mpf:
     plugins: ignore
     platforms: ignore
     paths: ignore
-    report_crashes: single|enum(ask,never,always)|ask
+    report_crashes: single|enum(ask,never,always)|never
     rgbw_white_behavior: single|enum(white_only,min_rgb,duck_rgb)|duck_rgb
 mpf-mc:
     __valid_in__: machine                           # todo add to validator
@@ -1240,7 +1247,7 @@ pin2dmd:
     debug: single|bool|false
     console_log: single|enum(none,basic,full)|none
     file_log: single|enum(none,basic,full)|basic
-    resolution: single|enum(128x32,192x64)|128x32
+    resolution: single|enum(128x32,192x64,256x64)|128x32
     panel: single|enum(rgb,rbg)|rgb
 pkone:
     __valid_in__: machine
@@ -1941,23 +1948,40 @@ spinners:
 steppers:
     __valid_in__: machine
     __type__: device
-    named_positions: dict|float:str|None
     home_events: event_handler|event_handler:ms|None
+    home_on_startup: single|bool|true
     homing_mode: single|enum(hardware,switch)|hardware
     homing_switch: single|machine(switches)|None
     homing_direction: single|enum(clockwise,counterclockwise)|clockwise
+    homing_speed: single|int|None
     pos_min: single|int|0
     pos_max: single|int|1000
     ball_search_min: single|int|0
     ball_search_max: single|int|1
     ball_search_wait: single|ms|5s
     include_in_ball_search: single|bool|true
-    relative_positions: dict|float:str|None
+    relative_positions: dict|float:subconfig(stepper_position_settings)|None
     reset_position: single|int|0
     reset_events: event_handler|event_handler:ms|machine_reset_phase_3, ball_starting, ball_will_end, service_mode_entered
+    named_positions: dict|float:subconfig(stepper_position_settings)|None
+    number: single|str|
+    platform: single|str|None
+    platform_settings: single|dict|None
+stepper_position_settings:
+    event: single|str|
+    speed: single|int|None
+shakers:
+    __valid_in__: machine
+    __type__: device
+    default_power: single|float|0.0
     number: single|str|
+    control_events: dict|str:subconfig(shaker_pulse_settings)|None
     platform: single|str|None
     platform_settings: single|dict|None
+shaker_pulse_settings:
+    action: single|enum(pulse,stop)|pulse
+    power: single|float|None
+    duration: single|template_secs|None
 spike_stepper_settings:
     homing_speed: single|int|10
     speed: single|int|20
@@ -2390,3 +2414,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.57.3.dev3 → mpf-0.57.4}/mpf/core/bcp/bcp_interface.py

@@ -101,10 +101,10 @@ class BcpInterface(MpfController):
         if not self.machine.bcp.transport.get_transports_for_handler(event):
             self.machine.events.remove_handler_by_event(event=event, handler=self.bcp_trigger)
 
-    async def _bcp_receive_set_machine_var(self, client, name, value):
+    async def _bcp_receive_set_machine_var(self, client, name, value, persist=False):
         """Set machine var via bcp."""
         del client
-        self.machine.variables.set_machine_var(name, value)
+        self.machine.variables.set_machine_var(name, value, persist)
         # document variables injected by MC
         '''machine_var: mc_version
 
@@ -458,8 +458,8 @@ class BcpInterface(MpfController):
             self.machine.register_monitor('machine_vars', self._machine_var_change)
 
         # Send initial machine variable values
-        for s in ("standard", "feature", "game", "coin"):
-            self._send_machine_vars(client, setting_type=s)
+        self._send_machine_vars(client)
+        self._send_machine_settings(client)
 
         # Establish handler for machine variable changes
         self.machine.bcp.transport.add_handler_to_transport("_machine_vars", client)
@@ -471,10 +471,14 @@ class BcpInterface(MpfController):
         if not self.machine.bcp.transport.get_transports_for_handler("_machine_vars"):
             self.machine.machine_var_monitor = False
 
-    def _send_machine_vars(self, client, setting_type=None):
-        self.machine.bcp.transport.send_to_client(
-            client, bcp_command='settings',
-            settings=Util.convert_to_simply_type(self.machine.settings.get_settings(setting_type)))
+    def _send_machine_settings(self, client, setting_type=None):
+        settings = [setting_type] if setting_type else ["standard", "feature", "game", "coin", "hw_volume"]
+        for s in settings:
+            self.machine.bcp.transport.send_to_client(
+                client, bcp_command='settings',
+                settings=Util.convert_to_simply_type(self.machine.settings.get_settings(s)))
+
+    def _send_machine_vars(self, client):
         for var_name, settings in self.machine.variables.machine_vars.items():
             self.machine.bcp.transport.send_to_client(client, bcp_command='machine_variable',
                                                       name=var_name,

{mpf-0.57.3.dev3 → mpf-0.57.4}/mpf/core/config_validator.py

@@ -588,7 +588,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.57.3.dev3 → mpf-0.57.4}/mpf/core/crash_reporter.py

@@ -176,7 +176,7 @@ def analyze_traceback(tb, inspection_level=None, limit=None):
 
 
 def _send_crash_report(report, reporting_url):
-    r = requests.post(reporting_url, json=report)
+    r = requests.post(reporting_url, json=report, timeout=60)
     if r.status_code != 200:
         print("Failed to send report. Got response code {}. Error: {}", r.status_code, r.content)
     else:

{mpf-0.57.3.dev3 → mpf-0.57.4}/mpf/core/device_manager.py

@@ -301,8 +301,7 @@ class DeviceCollection(dict):
         self.machine.log.warning("Iterating device collections directly is deprecated and will be removed. "
                                  "Access by value(): device_collections[%s] -> device_collections['%s'].values()",
                                  self.name, self.name)
-        for item in self.values():
-            yield item
+        yield from self.values()
 
     def items_tagged(self, tag) -> List["Device"]:
         """Return of list of device objects which have a certain tag.

{mpf-0.57.3.dev3 → mpf-0.57.4}/mpf/core/logging.py

@@ -160,12 +160,13 @@ class LogMixin:
         if error_no:
             error_slug = "Log-{}-{}".format(self.log.name if self.log else "", error_no)
             error_url = log_url.format(error_slug)
-        if error_no and context:
-            return "{} Context: {} Log Code: {} ({})".format(msg, context, error_slug, error_url)
+
+            if context:
+                return "{} Context: {} Log Code: {} ({})".format(msg, context, error_slug, error_url)
+            return "{} Log Code: {} ({})".format(msg, error_slug, error_url)
+
         if context:
             return "{} Context: {} ".format(msg, context)
-        if error_no:
-            return "{} Log Code: {} ({})".format(msg, error_slug, error_url)
 
         return msg
 

{mpf-0.57.3.dev3 → mpf-0.57.4}/mpf/core/machine.py

@@ -61,6 +61,7 @@ if MYPY:   # pragma: no cover
     from mpf.devices.digital_output import DigitalOutput    # pylint: disable-msg=cyclic-import,unused-import
     from logging import Logger  # noqa
     from mpf.devices.autofire import AutofireCoil   # pylint: disable-msg=cyclic-import,unused-import
+    from mpf.devices.shaker import Shaker   # pylint: disable-msg=cyclic-import,unused-import
     from mpf.devices.stepper import Stepper     # pylint: disable-msg=cyclic-import,unused-import
     from mpf.config_players.show_player import ShowPlayer   # pylint: disable-msg=cyclic-import,unused-import
     from mpf.devices.dmd import Dmd     # pylint: disable-msg=cyclic-import,unused-import
@@ -167,6 +168,7 @@ class MachineController(LogMixin):
             self.autofire_coils = {}                    # type: Dict[str, AutofireCoil]
             self.motors = {}                            # type: Dict[str, Motor]
             self.digital_outputs = {}                   # type: Dict[str, DigitalOutput]
+            self.shakers = {}                           # type: Dict[str, Shaker]
             self.shows = {}                             # type: Dict[str, Show]
             self.shots = {}                             # type: Dict[str, Shot]
             self.shot_groups = {}                       # type: Dict[str, ShotGroup]

{mpf-0.57.3.dev3 → mpf-0.57.4}/mpf/core/machine_vars.py

@@ -93,6 +93,11 @@ class MachineVariables(LogMixin):
 
         desc: Architecture of your machine (32bit/64bit).
         '''
+        self.set_machine_var(name="log_file_path", value=self.machine.options.get('full_logfile_path', ""))
+        '''machine_var: log_file_path
+
+        desc: Absolute path of the file log for the current running game.
+        '''
 
     def __getitem__(self, key):
         """Allow the user to access a machine variable with []. This would be used is machine.variables["var_name"]."""
@@ -177,6 +182,9 @@ class MachineVariables(LogMixin):
         ----
             name: String name of the variable you're setting the value for.
             value: The value you're setting. This can be any Type.
+            persist: Whether to persist this machine var to disk. Only
+                applies to new/unconfigured vars; vars defined in the
+                machine_vars config will use their config setting.
         """
         if name not in self.machine_vars:
             self.configure_machine_var(name=name, persist=persist)

{mpf-0.57.3.dev3 → mpf-0.57.4}/mpf/core/mode_device.py

@@ -22,13 +22,13 @@ class ModeDevice(Device, metaclass=abc.ABCMeta):
         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 @@ class ModeDevice(Device, metaclass=abc.ABCMeta):
             player: Current active player
         """
         del player
-        self.mode = mode
+        del mode
 
     @property
     def can_exist_outside_of_game(self) -> bool:
@@ -88,4 +88,3 @@ class ModeDevice(Device, metaclass=abc.ABCMeta):
             mode: Mode which stopped
         """
         del mode
-        self.mode = None