mpf 0.57.2.dev1__tar.gz → 0.57.2.dev2__tar.gz

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

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

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

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

{mpf-0.57.2.dev1 → mpf-0.57.2.dev2}/mpf/config_spec.yaml

@@ -1300,7 +1300,7 @@ player_vars:
 playfields:
     __valid_in__: machine
     __type__: device
-    enable_ball_search: single|bool|None
+    enable_ball_search: single|template_bool|None
     ball_search_timeout: single|ms|15s
     ball_search_interval: single|ms|150ms
     ball_search_phase_1_searches: single|int|3

{mpf-0.57.2.dev1 → mpf-0.57.2.dev2}/mpf/core/ball_search.py

@@ -121,13 +121,16 @@ class BallSearch(MpfController):
             return
 
         del kwargs
-        if self.playfield.config['enable_ball_search'] is False or (
-            not self.playfield.config['enable_ball_search'] and
+        is_ball_search_enabled = self.playfield.config['enable_ball_search'].evaluate({}) if \
+            self.playfield.config['enable_ball_search'] else None
+        if is_ball_search_enabled is False or (
+            is_ball_search_enabled is None and
                 not self.machine.config['mpf']['default_ball_search']):
             return
 
         if not self.callbacks:
-            raise AssertionError("No callbacks registered")
+            raise AssertionError(f"Cannot run ball search on playfield '{self.playfield.name}', no callbacks "
+                                 "registered. Do you have any shots/devices defined in this playfield?")
 
         self.debug_log("Enabling Ball Search")
 
@@ -255,14 +258,6 @@ class BallSearch(MpfController):
                 element = next(self.iterator)
             except StopIteration:
                 self.iteration += 1
-                self.machine.events.post('ball_search_phase_{}'.format(self.phase),
-                                         iteration=self.iteration)
-                '''event: ball_search_phase_(num)
-
-                desc: The ball search phase (num) has started.
-                args:
-                    iteration: Current iteration of phase (num)
-                '''
                 # give up at some point
                 if self.iteration > self.playfield.config[
                         'ball_search_phase_{}_searches'.format(self.phase)]:
@@ -272,6 +267,15 @@ class BallSearch(MpfController):
                         self.give_up()
                         return
 
+                self.machine.events.post('ball_search_phase_{}'.format(self.phase),
+                                         iteration=self.iteration)
+                '''event: ball_search_phase_(num)
+
+                desc: The ball search phase (num) has started.
+                args:
+                    iteration: Current iteration of phase (num)
+                '''
+
                 self.iterator = iter(self.callbacks)
                 element = next(self.iterator)
                 timeout = self.playfield.config[

{mpf-0.57.2.dev1 → mpf-0.57.2.dev2}/mpf/devices/diverter.py

@@ -379,15 +379,15 @@ class Diverter(SystemWideDevice):
         del phase
         del iteration
         if self.active:
-            self.info_log("Temporarily deactivating diverter to search ball for %sms",
-                          self.config['ball_search_hold_time'])
+            self.debug_log("Temporarily deactivating diverter to search ball for %sms",
+                           self.config['ball_search_hold_time'])
             self._coil_deactivate()
             self.machine.delay.add(self.config['ball_search_hold_time'],
                                    self._coil_activate,
                                    'diverter_{}_ball_search'.format(self.name))
         else:
-            self.info_log("Temporarily activating diverter to search ball for %sms",
-                          self.config['ball_search_hold_time'])
+            self.debug_log("Temporarily activating diverter to search ball for %sms",
+                           self.config['ball_search_hold_time'])
             self._coil_activate()
             self.machine.delay.add(self.config['ball_search_hold_time'],
                                    self._coil_deactivate,

{mpf-0.57.2.dev1 → mpf-0.57.2.dev2}/mpf/devices/drop_target.py

@@ -70,13 +70,13 @@ class DropTarget(SystemWideDevice):
 
     def _ignore_switch_hits_for(self, ms, reset_attempt=None):
         """Ignore switch hits for ms."""
-        self.info_log("Ignoring switch hits for %sms", ms)
+        self.debug_log("Ignoring switch hits for %sms", ms)
         self.config['switch'].mute()
         self._ignore_switch_hits = True
         self.delay.reset(name="ignore_switch", callback=self._restore_switch_hits, ms=ms, reset_attempt=reset_attempt)
 
     def _restore_switch_hits(self, reset_attempt=None):
-        self.info_log("Restoring switch hits")
+        self.debug_log("Restoring switch hits")
         self.config['switch'].unmute()
         self._ignore_switch_hits = False
         self._update_state_from_switch(reconcile=True)
@@ -92,15 +92,12 @@ class DropTarget(SystemWideDevice):
             self.debug_log("Reset confirmed!")
 
     def _ball_search_phase1(self):
-        self.info_log("Ball search phase 1: complete is %s", self.complete)
         if not self.complete and self.reset_coil:
-            self.info_log(" - not complete, firing reset coil")
             self._ignore_switch_hits_for(ms=self.config['ignore_switch_ms'])
             self.reset_coil.pulse()
             return True
         # if down. knock down again
         if self.complete and self.knockdown_coil:
-            self.info_log(" - complete, firing knockdown coil")
             self.knockdown_coil.pulse()
             return True
         return False
@@ -222,14 +219,13 @@ class DropTarget(SystemWideDevice):
             self.config['switch'])
 
         self.debug_log("Drop target %s switch %s has active value %s compared to drop complete %s",
-                      self.name, self.config['switch'].name, is_complete, self.complete)
+                       self.name, self.config['switch'].name, is_complete, self.complete)
         if self._in_ball_search or self._ignore_switch_hits:
             self.debug_log("Ignoring state change in drop target %s due to being in ball search "
                            "or ignoring switch hits", self.name)
             return
 
         if not reconcile:
-            self.debug_log("Hit without reconciling, marking playfield as active")
             self.config['playfield'].mark_playfield_active_from_device_action(self.name)
 
         if is_complete != self.complete:

{mpf-0.57.2.dev1 → mpf-0.57.2.dev2}/mpf/tests/test_BallSearch.py

@@ -1,3 +1,4 @@
+from mpf.core.placeholder_manager import NativeTypeTemplate
 from mpf.tests.MpfGameTestCase import MpfGameTestCase
 from unittest.mock import MagicMock
 
@@ -16,7 +17,7 @@ class TestBallSearch(MpfGameTestCase):
         return 'smart_virtual'
 
     def test_ball_search_does_not_start_when_disabled(self):
-        self.machine.playfields["playfield"].config['enable_ball_search'] = False
+        self.machine.playfields["playfield"].config['enable_ball_search'] = NativeTypeTemplate(False, self.machine)
 
         self.machine.ball_controller.num_balls_known = 0
         self.machine.switch_controller.process_switch("s_ball_switch1", 1)
@@ -34,14 +35,14 @@ class TestBallSearch(MpfGameTestCase):
         self.assertFalse(self.machine.ball_devices['playfield'].ball_search.enabled)
         self.assertFalse(self.machine.ball_devices['playfield'].ball_search.started)
 
-        self.machine.playfields["playfield"].config['enable_ball_search'] = None
+        self.machine.playfields["playfield"].config['enable_ball_search'] =  NativeTypeTemplate(None, self.machine)
         self.machine.config['mpf']['default_ball_search'] = True
         self.machine.ball_devices['playfield'].ball_search.enable()
         self.assertTrue(self.machine.ball_devices['playfield'].ball_search.enabled)
         self.machine.ball_devices['playfield'].ball_search.disable()
         self.assertFalse(self.machine.ball_devices['playfield'].ball_search.enabled)
 
-        self.machine.playfields["playfield"].config['enable_ball_search'] = None
+        self.machine.playfields["playfield"].config['enable_ball_search'] =  NativeTypeTemplate(None, self.machine)
         self.machine.config['mpf']['default_ball_search'] = False
         self.machine.ball_devices['playfield'].ball_search.enable()
         self.assertFalse(self.machine.ball_devices['playfield'].ball_search.enabled)

{mpf-0.57.2.dev1 → mpf-0.57.2.dev2}/mpf/tests/test_DropTargets.py

@@ -1,3 +1,4 @@
+from mpf.core.placeholder_manager import NativeTypeTemplate
 from mpf.tests.MpfFakeGameTestCase import MpfFakeGameTestCase
 from unittest.mock import MagicMock, patch
 
@@ -323,7 +324,7 @@ class TestDropTargets(MpfTestCase):
 
     def test_drop_target_ignore_ms_ball_search(self):
 
-        self.machine.playfields["playfield"].config['enable_ball_search'] = True
+        self.machine.playfields["playfield"].config['enable_ball_search'] = NativeTypeTemplate(True, self.machine)
         self.machine.playfields["playfield"].balls += 1
 
         self.mock_event('drop_target_center1_down')

{mpf-0.57.2.dev1 → mpf-0.57.2.dev2}/mpf/tests/test_Stepper.py

@@ -1,3 +1,4 @@
+from mpf.core.placeholder_manager import NativeTypeTemplate
 from unittest.mock import MagicMock
 from mpf.tests.MpfTestCase import MpfTestCase
 
@@ -142,7 +143,7 @@ class TestStepper(MpfTestCase):
     def test_ball_search(self):
         stepper = self.machine.steppers["linearAxis_stepper"]
 
-        self.machine.playfields["playfield"].config['enable_ball_search'] = True
+        self.machine.playfields["playfield"].config['enable_ball_search'] = NativeTypeTemplate(True, self.machine)
         self.machine.playfields["playfield"].balls += 1
 
         event_future = self.machine.events.wait_for_event("stepper_linearAxis_stepper_ready")

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

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