Multiball lock ball handler fixes for multiple-eject devices

Author: avanwinkle

mpf/devices/ball_device/outgoing_balls_handler.py

@@ -424,6 +424,25 @@ async def _eject_ball(self, eject_request: OutgoingBall, eject_try: int) -> bool
             result = await self._handle_confirm(eject_request, ball_eject_process, incoming_ball_at_target,
                                                 eject_try)
             await self.ball_device.ball_count_handler.end_eject(ball_eject_process, result)
+
+            self.info_log("Eject successful, looking for missing balls")
+            new_balls = await self.ball_device.ball_count_handler.counter.count_balls()
+            old_balls = self.ball_device.counted_balls
+            self.info_log("Found %s physical balls and %s expected balls", new_balls, old_balls)
+            if new_balls < old_balls:
+                # Post that the ball is lost
+                await self.ball_device.lost_idle_ball()
+                # Cancel the eject queue for the lost ball
+                self.info_log("How many ejects are requested? %s", self.ball_device.requested_balls)
+                self.info_log("Playfield ejects requested? %s", self.machine.playfields.playfield.num_balls_requested)
+                for _ in range(0, old_balls - new_balls):
+                    self.info_log("Cancelling one queued request")
+                    self._eject_queue.get_nowait()
+                    self._eject_queue.task_done()
+                self.info_log("Necessary queue requests are completed. Updating ball count to %s." % new_balls)
+                self.ball_device.ball_count_handler._set_ball_count(new_balls)
+
+
             return result
         except asyncio.CancelledError:
             ball_eject_process.cancel()

mpf/devices/multiball_lock.py

@@ -319,15 +319,15 @@ def _lock_ball(self, unclaimed_balls: int, new_available_balls: int, device: "Ba
         '''
 
         # schedule eject of new balls for all physically locked balls
-        if self.config['balls_to_replace'] == -1 or self.locked_balls <= self.config['balls_to_replace']:
-            self.debug_log("{} locked balls and {} to replace, requesting {} new balls"
-                           .format(self.locked_balls, self.config['balls_to_replace'], balls_to_lock_physically))
+        if self.config['balls_to_replace'] == -1 or new_locked_balls <= self.config['balls_to_replace']:
+            self.info_log("{} locked balls and {} to replace, requesting {} new balls"
+                           .format(new_locked_balls, self.config['balls_to_replace'], balls_to_lock_physically))
             self._request_new_balls(balls_to_lock_physically)
         else:
-            self.debug_log("{} locked balls exceeds {} to replace, not requesting any balls"
-                           .format(self.locked_balls, self.config['balls_to_replace']))
+            self.info_log("{} locked balls exceeds {} to replace, not requesting any balls"
+                           .format(new_locked_balls, self.config['balls_to_replace']))
 
-        self.debug_log("Locked %s balls virtually and %s balls physically", balls_to_lock, balls_to_lock_physically)
+        self.info_log("Locked %s balls virtually and %s balls physically", balls_to_lock, balls_to_lock_physically)
 
         return {'unclaimed_balls': unclaimed_balls - balls_to_lock_physically}