Merge branch 'dev' of https://github.com/missionpinball/mpf into dev

.github/workflows/run_tests.yml

@@ -10,24 +10,30 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - os: windows-latest
-          python-version: 3.7
         - os: windows-latest
           python-version: 3.8
         - os: windows-latest
           python-version: 3.9
-        - os: ubuntu-latest
-          python-version: 3.7
+        - os: windows-latest
+          python-version: "3.10"
+        - os: windows-latest
+          python-version: 3.11
         - os: ubuntu-latest
           python-version: 3.8
         - os: ubuntu-latest
           python-version: 3.9
-        - os: macos-latest
-          python-version: 3.7
+        - os: ubuntu-latest
+          python-version: "3.10"
+        - os: ubuntu-latest
+          python-version: 3.11
         - os: macos-latest
           python-version: 3.8
         - os: macos-latest
           python-version: 3.9
+        - os: macos-latest
+          python-version: "3.10"
+        - os: macos-latest
+          python-version: 3.11
 
     steps:
       - name: Checkout MPF

AUTHORS → AUTHORS.md

@@ -1,11 +1,9 @@
-Authors & Contributors
-======================
+# Authors & Contributors
 
 The following folks are the ones who've made MPF possible. Some big. Some small. All in
 their spare time, unpaid, for the love of pinball!
 
  * Brian Madden <brian@missionpinball.org>
- * Gabe Knuth <gabe@missionpinball.org>
  * Jan Kantert <jan-mission-pinball@kantert.net>
  * Quinn Capen <qcapen@gmail.com>
  * John Marsh <john.marsh@gmail.com>
@@ -31,8 +29,9 @@ their spare time, unpaid, for the love of pinball!
  * James Cardona
  * Dave Ensminger <dave@ensadi.com>
  * Charles Duncan (nullbuilds)
+ * Eric Selk <ericselk2018@gmail.com>
 
-MPF was inspired by pyprocgame which were written by:
+MPF was inspired by pyprocgame which was written by:
 
  * Adam Preble
  * Gerry Stellenberg

TODO.md

@@ -0,0 +1,24 @@
+# FAST Platform Rewrite TODO list for MPF 0.57
+
+* Get rid of all communicator-level message waiting?
+
+* Get FAST EXP tests working
+* Finish the FAST machine reset test
+* Add a test for ball ending?
+* Merge fastpinball branch into mainline
+
+* On startup, address switch changes coming in while everything is being reset. Add an init flag and ignore them until cleared?
+* Delayed pulse. Add platform_setting for this.
+* Test single wound with EOS? Is this a thing?
+* Confirm recycle_ms when used with autofire rules
+* Test game start & restart process
+* Add a test for the "no config" case
+* slots
+* Find all the TODOs
+* Implement the soft reset at startup / restart
+* Figure out the config file errors / error logs to FAST site / etc.
+* Single LED update task
+
+Failing tests are
+ERROR: test_scoring (mpf.tests.test_CustomCode.TestCustomCode)
+And the FAST EXP and v1 tests

mpf/_version.py

@@ -10,38 +10,35 @@
 
 """
 
-__version__ = '0.56.1.dev13'
+__version__ = '0.57.0.dev5'
 '''The full version of MPF.'''
 
-__short_version__ = '0.56'
+__short_version__ = '0.57'
 '''The major.minor version of MPF.'''
 
 __bcp_version__ = '1.1'
 '''The version of BCP this build of MPF uses.'''
 
-__config_version__ = '5'
+__config_version__ = '6'
 '''The config file version this build of MPF uses.'''
 
-__show_version__ = '5'
+__show_version__ = '6'
 '''The show format version this build of MPF uses.'''
 
 # pylint: disable-msg=invalid-name
-version = "MPF v{}".format(__version__)
+version = "Mission Pinball Framework (FAST Dev Fork) v{}".format(__version__)
 '''A friendly version string for this build of MPF.'''
+# TODO change back before mainlining
 
 # pylint: disable-msg=invalid-name
-extended_version = "MPF v{}, Config version:{}, Show version: {}, " \
+extended_version = "Mission Pinball Framework v{}, Config version:{}, Show version: {}, " \
                    "BCP version:{}".format(__version__, __config_version__,
                                            __show_version__, __bcp_version__)
 '''An extended version string that includes the MPF version, show version,
 and BCP versions used in this build of MPF.'''
 
-if "dev" in __version__:
-    # pylint: disable-msg=invalid-name
-    log_url = "https://missionpinball.org/logs/{}"
-else:
-    # pylint: disable-msg=invalid-name
-    log_url = "https://missionpinball.org/{}/logs/{{}}".format(__short_version__)
+log_url = "https://missionpinball.org/logs"
+# TODO make dynamic "https://docs.missionpinball.org/en/dev/logs/{}.html"
 
 __api__ = ['version',
            '__short_version__',

mpf/benchmarks/machine_files/events/config/config.yaml

@@ -1,2 +1 @@
-#config_version=5
-
+#config_version=6

mpf/benchmarks/machine_files/shows/config/config.yaml

@@ -1,4 +1,4 @@
-#config_version=5
+#config_version=6
 lights:
   light_1:
     number: 1

mpf/benchmarks/machine_files/shows/shows/minimal_light_show.yaml

@@ -1,4 +1,4 @@
-#show_version=5
+#show_version=6
 - duration: .001
   lights:
     light_1: red

mpf/benchmarks/machine_files/shows/shows/minimal_light_show_token.yaml

@@ -1,4 +1,4 @@
-#show_version=5
+#show_version=6
 - duration: .001
   lights:
     (led): red

mpf/benchmarks/machine_files/shows/shows/multi_step_tags.yaml

@@ -1,4 +1,4 @@
-#show_version=5
+#show_version=6
 - duration: .001
   lights:
     (tag1): (color1)

mpf/benchmarks/machine_files/shows/shows/single_step_tag.yaml

@@ -1,4 +1,4 @@
-#show_version=5
+#show_version=6
 - duration: .001
   lights:
     (tag): (color)

mpf/benchmarks/machine_files/switch_hits/config/config.yaml

@@ -1,4 +1,4 @@
-#config_version=5
+#config_version=6
 switches:
   s_switch_standard_playfield:
     number: 1

mpf/commands/build.py

@@ -54,13 +54,16 @@ def __init__(self, args, path):
     def production_bundle(self):
         """Create a production bundle."""
         config_loader = YamlMultifileConfigLoader(self.machine_path, self.args.configfile, False, False)
-        mpf_config = config_loader.load_mpf_config()
-        if self.args.mc:
-            mc_config = config_loader.load_mc_config()
 
+        mpf_config = config_loader.load_mpf_config()
         if self.args.dest_path:
             mpf_config.set_machine_path(self.args.dest_path)
 
+        if self.args.mc:
+            mc_config = config_loader.load_mc_config()
+            if self.args.dest_path:
+                mc_config.set_machine_path(self.args.dest_path)
+
         pickle.dump(mpf_config, open(ProductionConfigLoader.get_mpf_bundle_path(self.machine_path), "wb"))
         if self.args.mc:
             pickle.dump(mc_config, open(ProductionConfigLoader.get_mpf_mc_bundle_path(self.machine_path), "wb"))

mpf/commands/create_config.py

@@ -191,7 +191,7 @@ def create_machine_config_structure(config_name, machine_path):
         os.makedirs(os.path.normpath(machine_path))
         os.makedirs(os.path.normpath(os.path.join(machine_path, "config")))
         with open(os.path.normpath(os.path.join(machine_path, "config", "config.yaml")), "w") as f:
-            f.write("#config_version=5")
+            f.write("#config_version=6")
 
         # create test folder
         os.makedirs(os.path.normpath(os.path.join(machine_path, "tests")))
@@ -205,7 +205,7 @@ def create_show_structure(show_name, shows_dir, machine_path):
         """Create the basic hierarchy of a new show folder."""
         if not os.path.exists(shows_dir):
             os.makedirs(shows_dir)
-        file_content = "#show_version=5"
+        file_content = "#show_version=6"
         show_file_name = "{}.yaml".format(show_name)
         config_path = os.path.normpath(os.path.join(machine_path, "shows", show_file_name))
         Command.write_config_file(config_path, file_content)
@@ -217,7 +217,7 @@ def create_mode_structure(mode_name, mode_path, machine_path):
         # create config folder
         os.makedirs(os.path.normpath(os.path.join(machine_path, "modes", mode_name, "config")))
         # create config file
-        file_content = """#config_version=5
+        file_content = """#config_version=6
 
             mode:
                 start_events: ball_started

mpf/commands/game.py

@@ -6,7 +6,7 @@
 import signal
 import socket
 import sys
-from datetime import datetime
+import datetime
 import logging
 from logging.handlers import QueueHandler, SysLogHandler
 
@@ -74,7 +74,7 @@ def __init__(self, mpf_path, machine_path, args):
                             metavar='file_name',
                             default=os.path.join(
                                 "logs",
-                                datetime.now().strftime(
+                                datetime.datetime.now().strftime(
                                     "%Y-%m-%d-%H-%M-%S-mpf-" +
                                     socket.gethostname() + ".log")),
                             help="The name (and path) of the log file")
@@ -172,7 +172,8 @@ def __init__(self, mpf_path, machine_path, args):
 
         # tell the handler to use this format
         console_log.setFormatter(logging.Formatter(
-            '%(levelname)s : %(name)s : %(message)s'))
+            '%(asctime)s.%(msecs)03d : %(levelname)s : %(name)s : %(message)s', "%S"))
+
 
         # initialize async handler for console
         console_log_queue = Queue()