remove ball_add_live and move it into the playfield. fix #930

missionpinball · May 17, 2017 · 262d870 · 262d870
1 parent c890d65
commit 262d870
Show file tree

Hide file tree

Showing 39 changed files with 186 additions and 78 deletions.
diff --git a/mpf/core/config_spec.py b/mpf/core/config_spec.py
@@ -725,6 +725,7 @@
     ball_search_unblock_events: dict|str:ms|flipper_cradle_release
     ball_search_enable_events: dict|str:ms|None
     ball_search_disable_events: dict|str:ms|None
+    default_source_device: single|machine(ball_devices)|
 playfield_transfers:
     __valid_in__: machine
     ball_switch: single|machine(switches)|None

diff --git a/mpf/devices/playfield.py b/mpf/devices/playfield.py
@@ -185,9 +185,8 @@ def add_ball(self, balls=1, source_device=None,
 
         The source_device arg is included to give you an options for specifying
         the source of the ball(s) to be added. This argument is optional, so if
-        you don't supply them then MPF will look for a device
-        tagged with 'ball_add_live'. If you don't provide a source and you don't
-        have a device with the 'ball_add_live' tag, MPF will quit.
+        you don't supply them then MPF will use the default_source_device of
+        this playfield.
 
         This method does *not* increase the game controller's count of the
         number of balls in play. So if you want to add balls (like in a
@@ -234,20 +233,8 @@ def add_ball(self, balls=1, source_device=None,
                                  "doesn't  make sense. Not adding any balls...")
 
         # Figure out which device we'll get a ball from
-
-        if source_device:
-            pass
-        else:
-            for device in self.machine.ball_devices.items_tagged('ball_add_live'):
-                if self in device.config['eject_targets']:
-                    source_device = device
-                    break
-
         if not source_device:
-            raise AssertionError("Received request to add a ball to the playfield"
-                                 ", but no source device was passed and no ball "
-                                 "devices are tagged with 'ball_add_live'. Cannot"
-                                 " add a ball.")
+            source_device = self.config['default_source_device']
 
         self.debug_log("Received request to add %s ball(s). Source device: %s."
                        " Player-controlled: %s", balls,

diff --git a/mpf/mpfconfig.yaml b/mpf/mpfconfig.yaml
@@ -397,10 +397,6 @@ psus:
   default:
     voltage: 48
 
-playfields:
-    playfield:
-        tags: default
-
 hardware:
   platform: smart_virtual
   coils: default

diff --git a/mpf/tests/MpfTestCase.py b/mpf/tests/MpfTestCase.py
@@ -46,9 +46,10 @@ class TestMachineController(MachineController):
     """
     local_mpf_config_cache = {}     # type: Any
 
-    def __init__(self, mpf_path, machine_path, options, config_patches, clock, mock_data,
+    def __init__(self, mpf_path, machine_path, options, config_patches, config_defaults, clock, mock_data,
                  enable_plugins=False):
         self.test_config_patches = config_patches
+        self.test_config_defaults = config_defaults
         self._enable_plugins = enable_plugins
         self._test_clock = clock
         self._mock_data = mock_data
@@ -75,6 +76,7 @@ def _register_plugin_config_players(self):
 
     def _load_config(self):
         super()._load_config()
+        self.config = Util.dict_merge(self.test_config_defaults, self.config)
         self.config = Util.dict_merge(self.config, self.test_config_patches)
 
 
@@ -95,6 +97,13 @@ def __init__(self, methodName='runTest'):
         self.machine_config_patches['mpf']['default_platform_hz'] = 100
         self.machine_config_patches['mpf']['plugins'] = list()
         self.machine_config_patches['bcp'] = []
+
+        self.machine_config_defaults = dict()
+        self.machine_config_defaults['playfields'] = dict()
+        self.machine_config_defaults['playfields']['playfield'] = dict()
+        self.machine_config_defaults['playfields']['playfield']['tags'] = "default"
+        self.machine_config_defaults['playfields']['playfield']['default_source_device'] = None
+
         self._last_event_kwargs = {}
         self._events = {}
         self.expected_duration = 0.5
@@ -411,7 +420,8 @@ def setUp(self):
             self.machine = TestMachineController(
                 os.path.abspath(os.path.join(
                     mpf.core.__path__[0], os.pardir)), machine_path,
-                self.getOptions(), self.machine_config_patches, self.clock, self._get_mock_data(),
+                self.getOptions(), self.machine_config_patches, self.machine_config_defaults,
+                self.clock, self._get_mock_data(),
                 self.get_enable_plugins())
 
             self._initialise_machine()

diff --git a/mpf/tests/machine_files/auditor/config/config.yaml b/mpf/tests/machine_files/auditor/config/config.yaml
@@ -16,8 +16,13 @@ coils:
     c_eject:
         number:
 
+playfields:
+    playfield:
+        default_source_device: s_trough
+        tags: default
+
 ball_devices:
     s_trough:
         ball_switches: s_ball
         eject_coil: c_eject
-        tags: trough, drain, home, ball_add_live
+        tags: trough, drain, home
diff --git a/mpf/tests/machine_files/ball_controller/config/config.yaml b/mpf/tests/machine_files/ball_controller/config/config.yaml
@@ -34,6 +34,11 @@ switches:
         number:
         tags: playfield_active
 
+playfields:
+    playfield:
+        default_source_device: test_launcher
+        tags: default
+
 ball_devices:
     test_trough:
         eject_coil: eject_coil1
@@ -44,7 +49,6 @@ ball_devices:
     test_launcher:
         eject_coil: eject_coil2
         ball_switches: s_ball_switch_launcher
-        tags: ball_add_live
         debug: true
     test_vuk:
         eject_coil: eject_coil3

diff --git a/mpf/tests/machine_files/ball_device/config/test_ball_device.yaml b/mpf/tests/machine_files/ball_device/config/test_ball_device.yaml
@@ -3,6 +3,11 @@
 game:
     balls_per_game: 1
 
+playfields:
+    playfield:
+        default_source_device: test_target1
+        tags: default
+
 coils:
     eject_coil1:
         number:
@@ -61,7 +66,6 @@ ball_devices:
         eject_coil: eject_coil3
         ball_switches: s_ball_switch_target1
         debug: true
-        tags: ball_add_live
         confirm_eject_type: target
     test_target2:
         eject_coil: eject_coil4

diff --git a/mpf/tests/machine_files/ball_device/config/test_ball_device_auto_manual_plunger.yaml b/mpf/tests/machine_files/ball_device/config/test_ball_device_auto_manual_plunger.yaml
@@ -6,6 +6,11 @@ coils:
     plunger_eject:
         number:
 
+playfields:
+    playfield:
+        default_source_device: plunger
+        tags: default
+
 switches:
     s_trough_1:
         number:
@@ -33,5 +38,4 @@ ball_devices:
         ball_switches: s_plunger
         debug: true
         mechanical_eject: true
-        tags: ball_add_live
         player_controlled_eject_event: sw_launch
diff --git a/mpf/tests/machine_files/ball_device/config/test_ball_device_event_confirmation.yaml b/mpf/tests/machine_files/ball_device/config/test_ball_device_event_confirmation.yaml
@@ -3,6 +3,11 @@
 game:
     balls_per_game: 1
 
+playfields:
+    playfield:
+        default_source_device: test_target1
+        tags: default
+
 coils:
     eject_coil1:
         number:
@@ -57,7 +62,6 @@ ball_devices:
         eject_coil: eject_coil3
         ball_switches: s_ball_switch_target1
         debug: true
-        tags: ball_add_live
         confirm_eject_type: target
     test_target2:
         eject_coil: eject_coil4

diff --git a/mpf/tests/machine_files/ball_device/config/test_ball_device_jam_switch.yaml b/mpf/tests/machine_files/ball_device/config/test_ball_device_jam_switch.yaml
@@ -6,6 +6,11 @@ coils:
     plunger_eject:
         number:
 
+playfields:
+    playfield:
+        default_source_device: plunger
+        tags: default
+
 switches:
     s_trough_1:
         number:
@@ -42,5 +47,4 @@ ball_devices:
         ball_switches: s_plunger
         debug: true
         mechanical_eject: true
-        tags: ball_add_live
         player_controlled_eject_event: sw_launch
diff --git a/mpf/tests/machine_files/ball_device/config/test_ball_device_manual_with_target.yaml b/mpf/tests/machine_files/ball_device/config/test_ball_device_manual_with_target.yaml
@@ -1,5 +1,10 @@
 #config_version=4
 
+playfields:
+    playfield:
+        default_source_device: test_launcher
+        tags: default
+
 coils:
     eject_coil1:
         number:
@@ -54,7 +59,6 @@ ball_devices:
         eject_targets: playfield, test_target
         mechanical_eject: true
         confirm_eject_type: target
-        tags: ball_add_live
     test_target:
         eject_coil: eject_coil3
         ball_switches: s_ball_switch_target

diff --git a/mpf/tests/machine_files/ball_device/config/test_ball_device_no_plunger_switch.yaml b/mpf/tests/machine_files/ball_device/config/test_ball_device_no_plunger_switch.yaml
@@ -1,5 +1,10 @@
 #config_version=4
 
+playfields:
+    playfield:
+        default_source_device: trough
+        tags: default
+
 coils:
     trough_eject:
         number:
@@ -24,4 +29,4 @@ ball_devices:
         eject_coil: trough_eject
         ball_switches: s_trough_1, s_trough_2, s_trough_3, s_trough_4
         debug: true
-        tags: trough, drain, home, ball_add_live
+        tags: trough, drain, home
diff --git a/mpf/tests/machine_files/ball_device/config/test_ball_device_routing.yaml b/mpf/tests/machine_files/ball_device/config/test_ball_device_routing.yaml
@@ -3,6 +3,11 @@
 game:
     balls_per_game: 1
 
+playfields:
+    playfield:
+        default_source_device: test_target1
+        tags: default
+
 coils:
     c_trough1:
         number:
@@ -47,7 +52,6 @@ ball_devices:
     test_target1:
         eject_coil: c_target1
         ball_switches: s_target1
-        tags: ball_add_live
     test_trough2:
         eject_coil: c_trough2
         ball_switches: s_trough2_1, s_trough2_2

diff --git a/mpf/tests/machine_files/ball_device/config/test_ball_device_switch_confirmation.yaml b/mpf/tests/machine_files/ball_device/config/test_ball_device_switch_confirmation.yaml
@@ -3,6 +3,11 @@
 game:
     balls_per_game: 1
 
+playfields:
+    playfield:
+        default_source_device: test_target1
+        tags: default
+
 coils:
     eject_coil1:
         number:
@@ -59,7 +64,6 @@ ball_devices:
         eject_coil: eject_coil3
         ball_switches: s_ball_switch_target1
         debug: true
-        tags: ball_add_live
         confirm_eject_type: target
     test_target2:
         eject_coil: eject_coil4

diff --git a/mpf/tests/machine_files/ball_device/config/test_ball_device_trigger_events.yaml b/mpf/tests/machine_files/ball_device/config/test_ball_device_trigger_events.yaml
@@ -1,5 +1,10 @@
 #config_version=4
 
+playfields:
+    playfield:
+        default_source_device: test_launcher
+        tags: default
+
 coils:
     eject_coil1:
         number:
@@ -14,8 +19,6 @@ coils:
     c_diverter:
         number:
 
-
-
 switches:
     s_ball_switch1:
         number:
@@ -49,7 +52,6 @@ ball_devices:
         eject_timeouts: 6s, 10s
         eject_targets: playfield, test_target
         confirm_eject_type: target
-        tags: ball_add_live
         player_controlled_eject_event: sw_launch
     test_target:
         eject_coil: eject_coil3

diff --git a/mpf/tests/machine_files/ball_device/config/test_gottlieb_trough.yaml b/mpf/tests/machine_files/ball_device/config/test_gottlieb_trough.yaml
@@ -3,9 +3,15 @@
 game:
     balls_per_game: 3
     allow_start_with_ball_in_drain: True
+
 machine:
     min_balls: 3
 
+playfields:
+    playfield:
+        default_source_device: plunger
+        tags: default
+
 coils:
     outhole:
         number: 1
@@ -45,7 +51,6 @@ ball_devices:
         ball_capacity: 3
         debug: true
     plunger:
-        tags: ball_add_live
         ball_switches: plunger
         mechanical_eject: true
         eject_timeouts: 4s

diff --git a/mpf/tests/machine_files/ball_device/config/test_hold_coil.yaml b/mpf/tests/machine_files/ball_device/config/test_hold_coil.yaml
@@ -1,5 +1,10 @@
 #config_version=4
 
+playfields:
+    playfield:
+        default_source_device: test
+        tags: default
+
 coils:
     hold_coil:
         number:
@@ -10,7 +15,6 @@ coils:
     hold_coil4:
         number:
 
-
 switches:
     s_entrance:
         number:

diff --git a/mpf/tests/machine_files/ball_device/config/test_single_device.yaml b/mpf/tests/machine_files/ball_device/config/test_single_device.yaml
@@ -1,5 +1,10 @@
 #config_version=4
 
+playfields:
+    playfield:
+        default_source_device: trough
+        tags: default
+
 coils:
     c_eject:
         number:
@@ -15,5 +20,5 @@ ball_devices:
     trough:
         eject_coil: c_eject
         ball_switches: s_trough
-        tags: home, trough, drain, ball_add_live
+        tags: home, trough, drain
         debug: True
diff --git a/mpf/tests/machine_files/ball_device/config/test_system_11_trough.yaml b/mpf/tests/machine_files/ball_device/config/test_system_11_trough.yaml
@@ -4,6 +4,11 @@ game:
     balls_per_game: 3
     allow_start_with_ball_in_drain: True
 
+playfields:
+    playfield:
+        default_source_device: plunger
+        tags: default
+
 coils:
     outhole:
         number: C09
@@ -46,9 +51,7 @@ ball_devices:
         confirm_eject_type: target
         debug: true
     plunger:
-        tags: ball_add_live
         ball_switches: plunger
         mechanical_eject: true
         eject_timeouts: 4s
-#        ball_missing_timeouts: 1s
         debug: true