mpf 0.57.1.dev4__tar.gz → 0.57.2.dev1__tar.gz

{mpf-0.57.1.dev4 → mpf-0.57.2.dev1}/PKG-INFO

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

{mpf-0.57.1.dev4 → mpf-0.57.2.dev1}/mpf/_version.py

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

{mpf-0.57.1.dev4 → mpf-0.57.2.dev1}/mpf/config_spec.yaml

@@ -1992,6 +1992,7 @@ switches:
     type: single|enum(NC,NO)|NO
     debounce: single|enum(auto,quick,normal)|auto
     ignore_window_ms: single|ms|0
+    ignore_during_ball_search: single|bool|false
     events_when_activated: list|event_posted|None
     events_when_deactivated: list|event_posted|None
     platform: single|str|None

{mpf-0.57.1.dev4 → mpf-0.57.2.dev1}/mpf/core/switch_controller.py

@@ -374,7 +374,8 @@ class SwitchController(MpfController):
 
         self._cancel_timed_handlers(obj)
 
-        self._call_handlers(obj, state)
+        if not obj.is_muted:
+            self._call_handlers(obj, state)
 
         for monitor in self.monitors:
             monitor(MonitoredSwitchChange(name=obj.name, label=obj.label, platform=obj.platform,

{mpf-0.57.1.dev4 → mpf-0.57.2.dev1}/mpf/devices/autofire.py

@@ -169,7 +169,7 @@ class AutofireCoil(SystemWideDevice):
         if not self._enabled:
             return
         if not self._ball_search_in_progress:
-            self.config['playfield'].mark_playfield_active_from_device_action()
+            self.config['playfield'].mark_playfield_active_from_device_action(self.name)
         if self._timeout_watch_time:
             current_time = self.machine.clock.get_time()
             self._timeout_hits = [t for t in self._timeout_hits if t > current_time - self._timeout_watch_time / 1000.0]

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

@@ -70,10 +70,14 @@ 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.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.config['switch'].unmute()
         self._ignore_switch_hits = False
         self._update_state_from_switch(reconcile=True)
 
@@ -88,12 +92,15 @@ 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
@@ -215,14 +222,15 @@ 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.config['playfield'].mark_playfield_active_from_device_action()
+            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:
 
@@ -269,8 +277,7 @@ class DropTarget(SystemWideDevice):
         device.
         Make sure we do not mark the playfield as active.
         """
-        if self.machine.switch_controller.is_active(self.config['switch']):
-            self._ignore_switch_hits_for(ms=self.config['ignore_switch_ms'])
+        self._update_state_from_switch(reconcile=True)
 
     def remove_from_bank(self, bank):
         """Remove the DropTarget from a bank.
@@ -400,8 +407,9 @@ class DropTargetBank(SystemWideDevice, ModeDevice):
             if drop_target.reset_coil and drop_target.complete:
                 coils.add(drop_target.reset_coil)
 
-            # tell the drop target that we are going to reset it physically
-            drop_target.external_reset_from_bank()
+            # Mute all the bank's switches
+            if self.config['ignore_switch_ms']:
+                drop_target.config['switch'].mute()
 
         for coil in self.reset_coils:
             coils.add(coil)
@@ -417,6 +425,7 @@ class DropTargetBank(SystemWideDevice, ModeDevice):
             self.debug_log("Coil %s firing has a wait of %s!", coil, wait_ms)
             restore_delay_ms += wait_ms
 
+        # Set a delay to unmute all the switches after the combined reset time plus ignore
         if self.config['ignore_switch_ms']:
             restore_delay_ms += self.config['ignore_switch_ms']
             if self.config['max_reset_attempts'] and attempt is None:
@@ -428,6 +437,9 @@ class DropTargetBank(SystemWideDevice, ModeDevice):
                            reset_attempt=attempt)
 
     def _restore_switch_hits(self, reset_attempt=None):
+        for target in self.drop_targets:
+            target.config['switch'].unmute()
+            target.external_reset_from_bank()
         self._ignore_switch_hits = False
         self.member_target_change()
 

{mpf-0.57.1.dev4 → mpf-0.57.2.dev1}/mpf/devices/magnet.py

@@ -62,7 +62,7 @@ class Magnet(EnableDisableMixinSystemWideDevice, SystemWideDevice):
     def grab_ball(self):
         """Grab a ball."""
         # mark the playfield active no matter what
-        self.config['playfield'].mark_playfield_active_from_device_action()
+        self.config['playfield'].mark_playfield_active_from_device_action(self.name)
         # check if magnet is enabled or already active
         if not self.enabled or self._active or self._release_in_progress:
             return

{mpf-0.57.1.dev4 → mpf-0.57.2.dev1}/mpf/devices/playfield.py

@@ -261,19 +261,19 @@ class Playfield(SystemWideDevice):
             incoming_ball.ball_arrived()
             break
 
-    def _mark_playfield_active(self):
+    def _mark_playfield_active(self, source=None):
         self.ball_arrived()
-        self.machine.events.post_boolean(self.name + "_active")
+        self.machine.events.post_boolean(self.name + "_active", source=source)
         '''event: (name)_active
         desc: The playfield called (name) is now active, meaning there's
         at least one loose ball on it.
         '''
 
-    def mark_playfield_active_from_device_action(self):
+    def mark_playfield_active_from_device_action(self, device_name=None):
         """Mark playfield active because a device on the playfield detected activity."""
-        self._playfield_switch_hit()
+        self._playfield_switch_hit(source=device_name)
 
-    def _playfield_switch_hit(self, **kwargs):
+    def _playfield_switch_hit(self, source=None, **kwargs):
         """Playfield switch was hit.
 
         A switch tagged with '<this playfield name>_active' was just hit,
@@ -281,7 +281,7 @@ class Playfield(SystemWideDevice):
 
         """
         if self.balls <= 0 or (kwargs.get('balls') and self.balls - kwargs['balls'] < 0):
-            self._mark_playfield_active()
+            self._mark_playfield_active(source)
 
             if not self.num_balls_requested:
                 self.debug_log("Playfield was activated with no balls expected.")

{mpf-0.57.1.dev4 → mpf-0.57.2.dev1}/mpf/devices/sequence_shot.py

@@ -102,7 +102,7 @@ class SequenceShot(SystemWideDevice, ModeDevice):
 
         # mark playfield active
         if self.config['playfield']:
-            self.config['playfield'].mark_playfield_active_from_device_action()
+            self.config['playfield'].mark_playfield_active_from_device_action(self.name)
 
         self.debug_log("Sequence advance: %s", event_name)
 

{mpf-0.57.1.dev4 → mpf-0.57.2.dev1}/mpf/devices/shot.py

@@ -55,7 +55,7 @@ class Shot(EnableDisableMixin, ModeDevice):
         """Mark playfield active."""
         del kwargs
         if self.config['mark_playfield_active']:
-            self.config['playfield'].mark_playfield_active_from_device_action()
+            self.config['playfield'].mark_playfield_active_from_device_action(self.name)
 
     def device_loaded_in_mode(self, mode: Mode, player: Player):
         """Add device to a mode that was already started.

{mpf-0.57.1.dev4 → mpf-0.57.2.dev1}/mpf/devices/switch.py

@@ -27,7 +27,7 @@ class Switch(SystemWideDevice, DevicePositionMixin):
     class_label = 'switch'
 
     __slots__ = ["hw_switch", "state", "hw_state", "invert", "recycle_secs", "recycle_clear_time",
-                 "recycle_jitter_count", "_events_to_post", "last_change"]
+                 "recycle_jitter_count",  "last_change", "_events_to_post", "_mutes"]
 
     def __init__(self, machine: MachineController, name: str) -> None:
         """Initialize switch."""
@@ -44,6 +44,7 @@ class Switch(SystemWideDevice, DevicePositionMixin):
         not consider whether a switch is NC or NO."""
 
         self.invert = 0
+        self._mutes = 0
 
         self.recycle_secs = 0
         self.recycle_clear_time = None
@@ -210,6 +211,10 @@ class Switch(SystemWideDevice, DevicePositionMixin):
                 self.config['events_when_deactivated']):
             self._create_activation_event(event, 0)
 
+        if self.config['ignore_during_ball_search']:
+            self.machine.events.add_handler("ball_search_started", self.mute)
+            self.machine.events.add_handler("ball_search_stopped", self.unmute)
+
     # pylint: disable-msg=too-many-arguments
     def add_handler(self, callback, state=1, ms=0, return_info=False,
                     callback_kwargs=None):
@@ -245,3 +250,19 @@ class Switch(SystemWideDevice, DevicePositionMixin):
         """Remove switch handler for this switch."""
         return self.machine.switch_controller.remove_switch_handler_obj(
             self, callback, state, ms)
+
+    def mute(self, **kwargs):
+        """Mute this switch so that switch hits do not trigger handlers."""
+        del kwargs
+        self._mutes += 1
+
+    def unmute(self, **kwargs):
+        """Unmute this switch so that hits again trigger handlers."""
+        del kwargs
+        self._mutes -= 1
+        assert self._mutes >= 0, "Switch %s has unmuted more times than muted." % self.name
+
+    @property
+    def is_muted(self):
+        """True if this switch is currently muted."""
+        return self._mutes > 0

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

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