mpf 0.80.0.dev13__tar.gz → 0.80.0.dev14__tar.gz

{mpf-0.80.0.dev13 → mpf-0.80.0.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mpf
-Version: 0.80.0.dev13
+Version: 0.80.0.dev14
 Summary: The Mission Pinball Framework (MPF)
 Author-email: The Mission Pinball Framework Team <brian@missionpinball.org>
 License: MIT
@@ -53,9 +53,9 @@ Requires-Dist: apigpio-mpf==0.0.4; extra == "rpi"
 Provides-Extra: uvloop
 Requires-Dist: uvloop==0.19.0; extra == "uvloop"
 Provides-Extra: vpe
-Requires-Dist: grpcio_tools==1.34.0; extra == "vpe"
-Requires-Dist: grpcio==1.34.0; extra == "vpe"
-Requires-Dist: protobuf==3.14.0; extra == "vpe"
+Requires-Dist: grpcio_tools==1.69.0; extra == "vpe"
+Requires-Dist: grpcio==1.69.0; extra == "vpe"
+Requires-Dist: protobuf==5.29.3; extra == "vpe"
 Provides-Extra: all
 Requires-Dist: prompt_toolkit==3.0.43; extra == "all"
 Requires-Dist: asciimatics==1.15.0; extra == "all"
@@ -66,11 +66,10 @@ Requires-Dist: smbus2_asyncio==0.0.5; extra == "all"
 Requires-Dist: python-osc==1.8.3; extra == "all"
 Requires-Dist: pyusb==1.1.0; extra == "all"
 Requires-Dist: apigpio-mpf==0.0.4; extra == "all"
-Requires-Dist: grpcio_tools==1.34.0; extra == "all"
-Requires-Dist: grpcio==1.34.0; extra == "all"
-Requires-Dist: protobuf==3.14.0; extra == "all"
+Requires-Dist: grpcio_tools==1.69.0; extra == "all"
+Requires-Dist: grpcio==1.69.0; extra == "all"
+Requires-Dist: protobuf==5.29.3; extra == "all"
 Requires-Dist: uvloop==0.19.0; extra == "all"
-Requires-Dist: numpy>=1.7.0; extra == "all"
 Dynamic: license-file
 
 Mission Pinball Framework (MPF)

{mpf-0.80.0.dev13 → mpf-0.80.0.dev14}/mpf/_version.py

@@ -10,7 +10,7 @@ PyPI.
 
 """
 
-__version__ = '0.80.0.dev13'
+__version__ = '0.80.0.dev14'
 '''The full version of MPF.'''
 
 __short_version__ = '0.80'

{mpf-0.80.0.dev13 → mpf-0.80.0.dev14}/mpf/core/randomizer.py

@@ -109,6 +109,7 @@ class Randomizer:
     def _next_not_random(self, conditional_args):
         total_items = len(self.items)
         current_item_index = self.data['current_item_index']
+
         if current_item_index >= total_items:
             if not self.loop:
                 raise StopIteration
@@ -118,13 +119,20 @@ class Randomizer:
         next_item_index = current_item_index
 
         rotated_option_list = self.items[next_item_index:] + self.items[:next_item_index]
+        found_it = False
         while len(rotated_option_list):
             next_item = rotated_option_list.pop(0)
             next_item_index += 1
             event = next_item[0]
             if not event.condition or (self._template_type and event.condition.evaluate(conditional_args)):
+                found_it = True
                 break
 
+        if not found_it and self.fallback_value:
+            self.data['current_item'] = self.fallback_value
+            self.data['current_item_index'] = 0
+            return self.fallback_value
+
         self.data['current_item'] = next_item
         self.data['current_item_index'] = next_item_index
 

{mpf-0.80.0.dev13 → mpf-0.80.0.dev14}/mpf/devices/ball_hold.py

@@ -9,7 +9,7 @@ from mpf.core.mode_device import ModeDevice
 from mpf.core.system_wide_device import SystemWideDevice
 
 
-@DeviceMonitor("balls_held")
+@DeviceMonitor("balls_held", "enabled")
 class BallHold(EnableDisableMixin, SystemWideDevice, ModeDevice):
 
     """Ball hold device which can be used to keep balls in ball devices and control their eject later on."""

{mpf-0.80.0.dev13 → mpf-0.80.0.dev14}/mpf/devices/ball_routing.py

@@ -17,7 +17,7 @@ if MYPY:   # pragma: no cover
     from mpf.core.machine import MachineController   # pylint: disable-msg=cyclic-import,unused-import
 
 
-@DeviceMonitor("balls_routing")
+@DeviceMonitor("balls_routing", "enabled")
 class BallRouting(EnableDisableMixin, ModeDevice):
 
     """Route balls from one device to another when captured."""

{mpf-0.80.0.dev13 → mpf-0.80.0.dev14}/mpf/devices/multiball.py

@@ -9,7 +9,7 @@ from mpf.core.placeholder_manager import NativeTypeTemplate
 from mpf.core.system_wide_device import SystemWideDevice
 
 
-@DeviceMonitor("shoot_again", "grace_period", "hurry_up", "balls_added_live", "balls_live_target")
+@DeviceMonitor("shoot_again", "grace_period", "hurry_up", "balls_added_live", "balls_live_target", "enabled")
 class Multiball(EnableDisableMixin, SystemWideDevice, ModeDevice):
 
     """Multiball device for MPF."""

{mpf-0.80.0.dev13 → mpf-0.80.0.dev14}/mpf/devices/multiball_lock.py

@@ -13,7 +13,7 @@ if MYPY:   # pragma: no cover
     from mpf.devices.playfield import Playfield     # pylint: disable-msg=cyclic-import,unused-import
 
 
-@DeviceMonitor("locked_balls")
+@DeviceMonitor("locked_balls", "enabled")
 class MultiballLock(EnableDisableMixin, ModeDevice):
 
     """Ball lock device which locks balls for a multiball."""

{mpf-0.80.0.dev13 → mpf-0.80.0.dev14}/mpf/devices/shot.py

@@ -10,7 +10,7 @@ from mpf.core.mode_device import ModeDevice
 from mpf.core.player import Player
 
 
-@DeviceMonitor("state", "state_name")
+@DeviceMonitor("state", "state_name", "enabled")
 class Shot(EnableDisableMixin, ModeDevice):
 
     """A device which represents a generic shot."""

{mpf-0.80.0.dev13 → mpf-0.80.0.dev14}/mpf/devices/spinner.py

@@ -13,7 +13,7 @@ if MYPY:   # pragma: no cover
     from mpf.core.machine import MachineController  # pylint: disable-msg=cyclic-import,unused-import
 
 
-@DeviceMonitor(_active="active", _idle="idle")
+@DeviceMonitor(_active="active", _idle="idle", enabled="enabled")
 class Spinner(EnableDisableMixinSystemWideDevice, SystemWideDevice):
 
     """Represents a spinner or spinner group in a pinball machine."""

{mpf-0.80.0.dev13 → mpf-0.80.0.dev14}/mpf/platforms/virtual.py

@@ -303,6 +303,11 @@ class VirtualHardwarePlatform(AccelerometerPlatform, I2cPlatform, ServoPlatform,
         self._assert_rule_does_not_exist(enable_switch.hw_switch, coil.hw_driver)
         self.rules[(enable_switch.hw_switch, coil.hw_driver)] = "pulse_on_hit"
 
+    def set_delayed_pulse_on_hit_rule(self, enable_switch, coil, delay_ms):
+        """Set pulse on hit after delay rule, typical of kickbacks."""
+        self._assert_rule_does_not_exist(enable_switch.hw_switch, coil.hw_driver)
+        self.rules[(enable_switch.hw_switch, coil.hw_driver)] = "delayed_pulse_on_hit"
+
     def configure_dmd(self):
         """Configure DMD."""
         return VirtualDmd()

mpf-0.80.0.dev14/mpf/platforms/visual_pinball_engine/platform_pb2.py

@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
+# source: platform.proto
+# Protobuf Python Version: 5.29.0
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    5,
+    29,
+    0,
+    '',
+    'platform.proto'
+)
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0eplatform.proto\x12\x07mpf.vpe\"\x0e\n\x0c\x45mptyRequest\"\x0f\n\rEmptyResponse\"\r\n\x0bQuitRequest\"\x99\x01\n\x0cMachineState\x12M\n\x15initial_switch_states\x18\x01 \x03(\x0b\x32..mpf.vpe.MachineState.InitialSwitchStatesEntry\x1a:\n\x18InitialSwitchStatesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x08:\x02\x38\x01\"O\n\x11SwitchDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x17\n\x0fhardware_number\x18\x02 \x01(\t\x12\x13\n\x0bswitch_type\x18\x03 \x01(\t\"8\n\x0f\x43oilDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x17\n\x0fhardware_number\x18\x02 \x01(\t\"a\n\x10LightDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x1f\n\x17hardware_channel_number\x18\x02 \x01(\t\x12\x1e\n\x16hardware_channel_color\x18\x03 \x01(\t\"\x9b\x01\n\x0e\x44mdDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12;\n\rcolor_mapping\x18\x02 \x01(\x0e\x32$.mpf.vpe.DmdDescription.ColorMapping\x12\r\n\x05width\x18\x03 \x01(\r\x12\x0e\n\x06height\x18\x04 \x01(\r\"\x1f\n\x0c\x43olorMapping\x12\x06\n\x02\x42W\x10\x00\x12\x07\n\x03RGB\x10\x01\"8\n\x19SegmentDisplayDescription\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05width\x18\x02 \x01(\r\"\xfb\x01\n\x12MachineDescription\x12,\n\x08switches\x18\x01 \x03(\x0b\x32\x1a.mpf.vpe.SwitchDescription\x12\'\n\x05\x63oils\x18\x02 \x03(\x0b\x32\x18.mpf.vpe.CoilDescription\x12)\n\x06lights\x18\x03 \x03(\x0b\x32\x19.mpf.vpe.LightDescription\x12%\n\x04\x64mds\x18\x04 \x03(\x0b\x32\x17.mpf.vpe.DmdDescription\x12<\n\x10segment_displays\x18\x05 \x03(\x0b\x32\".mpf.vpe.SegmentDisplayDescription\"Q\n\rSwitchChanges\x12\x15\n\rswitch_number\x18\x01 \x01(\t\x12\x14\n\x0cswitch_state\x18\x02 \x01(\x08\x12\x13\n\x0b\x63hange_time\x18\x03 \x01(\x04\"E\n\x12SetDmdFrameRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05\x66rame\x18\x02 \x01(\x0c\x12\x12\n\nbrightness\x18\x03 \x01(\x02\"\xc0\x01\n\x1dSetSegmentDisplayFrameRequest\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\r\n\x05\x66rame\x18\x02 \x01(\x0c\x12J\n\x06\x63olors\x18\x03 \x03(\x0b\x32:.mpf.vpe.SetSegmentDisplayFrameRequest.SegmentDisplayColor\x1a\x36\n\x13SegmentDisplayColor\x12\t\n\x01r\x18\x01 \x01(\x02\x12\t\n\x01g\x18\x02 \x01(\x02\x12\t\n\x01\x62\x18\x03 \x01(\x02\"\xf8\x03\n\x08\x43ommands\x12/\n\nfade_light\x18\x01 \x01(\x0b\x32\x19.mpf.vpe.FadeLightRequestH\x00\x12/\n\npulse_coil\x18\x02 \x01(\x0b\x32\x19.mpf.vpe.PulseCoilRequestH\x00\x12\x31\n\x0b\x65nable_coil\x18\x03 \x01(\x0b\x32\x1a.mpf.vpe.EnableCoilRequestH\x00\x12\x33\n\x0c\x64isable_coil\x18\x04 \x01(\x0b\x32\x1b.mpf.vpe.DisableCoilRequestH\x00\x12H\n\x17\x63onfigure_hardware_rule\x18\x05 \x01(\x0b\x32%.mpf.vpe.ConfigureHardwareRuleRequestH\x00\x12\x42\n\x14remove_hardware_rule\x18\x06 \x01(\x0b\x32\".mpf.vpe.RemoveHardwareRuleRequestH\x00\x12\x38\n\x11\x64md_frame_request\x18\x07 \x01(\x0b\x32\x1b.mpf.vpe.SetDmdFrameRequestH\x00\x12O\n\x1dsegment_display_frame_request\x18\x08 \x01(\x0b\x32&.mpf.vpe.SetSegmentDisplayFrameRequestH\x00\x42\t\n\x07\x63ommand\"\xa0\x01\n\x10\x46\x61\x64\x65LightRequest\x12\x16\n\x0e\x63ommon_fade_ms\x18\x01 \x01(\r\x12\x34\n\x05\x66\x61\x64\x65s\x18\x02 \x03(\x0b\x32%.mpf.vpe.FadeLightRequest.ChannelFade\x1a>\n\x0b\x43hannelFade\x12\x14\n\x0clight_number\x18\x01 \x01(\t\x12\x19\n\x11target_brightness\x18\x02 \x01(\x02\"N\n\x10PulseCoilRequest\x12\x13\n\x0b\x63oil_number\x18\x01 \x01(\t\x12\x10\n\x08pulse_ms\x18\x02 \x01(\r\x12\x13\n\x0bpulse_power\x18\x03 \x01(\x02\"c\n\x11\x45nableCoilRequest\x12\x13\n\x0b\x63oil_number\x18\x01 \x01(\t\x12\x10\n\x08pulse_ms\x18\x02 \x01(\r\x12\x13\n\x0bpulse_power\x18\x03 \x01(\x02\x12\x12\n\nhold_power\x18\x04 \x01(\x02\")\n\x12\x44isableCoilRequest\x12\x13\n\x0b\x63oil_number\x18\x01 \x01(\t\"\x85\x01\n\x1c\x43onfigureHardwareRuleRequest\x12\x13\n\x0b\x63oil_number\x18\x01 \x01(\t\x12\x15\n\rswitch_number\x18\x02 \x01(\t\x12\x10\n\x08pulse_ms\x18\x03 \x01(\r\x12\x13\n\x0bpulse_power\x18\x04 \x01(\x02\x12\x12\n\nhold_power\x18\x05 \x01(\x02\"G\n\x19RemoveHardwareRuleRequest\x12\x13\n\x0b\x63oil_number\x18\x01 \x01(\t\x12\x15\n\rswitch_number\x18\x02 \x01(\t\"#\n\x0cPingResponse\x12\x13\n\x0bmpf_version\x18\x01 \x01(\t2\xc9\x02\n\x12MpfHardwareService\x12\x33\n\x05Start\x12\x15.mpf.vpe.MachineState\x1a\x11.mpf.vpe.Commands0\x01\x12K\n\x15GetMachineDescription\x12\x15.mpf.vpe.EmptyRequest\x1a\x1b.mpf.vpe.MachineDescription\x12\x45\n\x11SendSwitchChanges\x12\x16.mpf.vpe.SwitchChanges\x1a\x16.mpf.vpe.EmptyResponse(\x01\x12\x34\n\x04Quit\x12\x14.mpf.vpe.QuitRequest\x1a\x16.mpf.vpe.EmptyResponse\x12\x34\n\x04Ping\x12\x15.mpf.vpe.EmptyRequest\x1a\x15.mpf.vpe.PingResponseb\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'platform_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_MACHINESTATE_INITIALSWITCHSTATESENTRY']._loaded_options = None
+  _globals['_MACHINESTATE_INITIALSWITCHSTATESENTRY']._serialized_options = b'8\001'
+  _globals['_EMPTYREQUEST']._serialized_start=27
+  _globals['_EMPTYREQUEST']._serialized_end=41
+  _globals['_EMPTYRESPONSE']._serialized_start=43
+  _globals['_EMPTYRESPONSE']._serialized_end=58
+  _globals['_QUITREQUEST']._serialized_start=60
+  _globals['_QUITREQUEST']._serialized_end=73
+  _globals['_MACHINESTATE']._serialized_start=76
+  _globals['_MACHINESTATE']._serialized_end=229
+  _globals['_MACHINESTATE_INITIALSWITCHSTATESENTRY']._serialized_start=171
+  _globals['_MACHINESTATE_INITIALSWITCHSTATESENTRY']._serialized_end=229
+  _globals['_SWITCHDESCRIPTION']._serialized_start=231
+  _globals['_SWITCHDESCRIPTION']._serialized_end=310
+  _globals['_COILDESCRIPTION']._serialized_start=312
+  _globals['_COILDESCRIPTION']._serialized_end=368
+  _globals['_LIGHTDESCRIPTION']._serialized_start=370
+  _globals['_LIGHTDESCRIPTION']._serialized_end=467
+  _globals['_DMDDESCRIPTION']._serialized_start=470
+  _globals['_DMDDESCRIPTION']._serialized_end=625
+  _globals['_DMDDESCRIPTION_COLORMAPPING']._serialized_start=594
+  _globals['_DMDDESCRIPTION_COLORMAPPING']._serialized_end=625
+  _globals['_SEGMENTDISPLAYDESCRIPTION']._serialized_start=627
+  _globals['_SEGMENTDISPLAYDESCRIPTION']._serialized_end=683
+  _globals['_MACHINEDESCRIPTION']._serialized_start=686
+  _globals['_MACHINEDESCRIPTION']._serialized_end=937
+  _globals['_SWITCHCHANGES']._serialized_start=939
+  _globals['_SWITCHCHANGES']._serialized_end=1020
+  _globals['_SETDMDFRAMEREQUEST']._serialized_start=1022
+  _globals['_SETDMDFRAMEREQUEST']._serialized_end=1091
+  _globals['_SETSEGMENTDISPLAYFRAMEREQUEST']._serialized_start=1094
+  _globals['_SETSEGMENTDISPLAYFRAMEREQUEST']._serialized_end=1286
+  _globals['_SETSEGMENTDISPLAYFRAMEREQUEST_SEGMENTDISPLAYCOLOR']._serialized_start=1232
+  _globals['_SETSEGMENTDISPLAYFRAMEREQUEST_SEGMENTDISPLAYCOLOR']._serialized_end=1286
+  _globals['_COMMANDS']._serialized_start=1289
+  _globals['_COMMANDS']._serialized_end=1793
+  _globals['_FADELIGHTREQUEST']._serialized_start=1796
+  _globals['_FADELIGHTREQUEST']._serialized_end=1956
+  _globals['_FADELIGHTREQUEST_CHANNELFADE']._serialized_start=1894
+  _globals['_FADELIGHTREQUEST_CHANNELFADE']._serialized_end=1956
+  _globals['_PULSECOILREQUEST']._serialized_start=1958
+  _globals['_PULSECOILREQUEST']._serialized_end=2036
+  _globals['_ENABLECOILREQUEST']._serialized_start=2038
+  _globals['_ENABLECOILREQUEST']._serialized_end=2137
+  _globals['_DISABLECOILREQUEST']._serialized_start=2139
+  _globals['_DISABLECOILREQUEST']._serialized_end=2180
+  _globals['_CONFIGUREHARDWARERULEREQUEST']._serialized_start=2183
+  _globals['_CONFIGUREHARDWARERULEREQUEST']._serialized_end=2316
+  _globals['_REMOVEHARDWARERULEREQUEST']._serialized_start=2318
+  _globals['_REMOVEHARDWARERULEREQUEST']._serialized_end=2389
+  _globals['_PINGRESPONSE']._serialized_start=2391
+  _globals['_PINGRESPONSE']._serialized_end=2426
+  _globals['_MPFHARDWARESERVICE']._serialized_start=2429
+  _globals['_MPFHARDWARESERVICE']._serialized_end=2758
+# @@protoc_insertion_point(module_scope)

{mpf-0.80.0.dev13 → mpf-0.80.0.dev14}/mpf/platforms/visual_pinball_engine/platform_pb2_grpc.py

@@ -1,9 +1,29 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
+import warnings
 
 from . import platform_pb2 as platform__pb2
 
+GRPC_GENERATED_VERSION = '1.69.0'
+GRPC_VERSION = grpc.__version__
+_version_not_supported = False
+
+try:
+    from grpc._utilities import first_version_is_lower
+    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
+except ImportError:
+    _version_not_supported = True
+
+if _version_not_supported:
+    raise RuntimeError(
+        f'The grpc package installed is at version {GRPC_VERSION},'
+        + f' but the generated code in platform_pb2_grpc.py depends on'
+        + f' grpcio>={GRPC_GENERATED_VERSION}.'
+        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
+        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
+    )
+
 
 class MpfHardwareServiceStub(object):
     """Missing associated documentation comment in .proto file."""
@@ -18,22 +38,27 @@ class MpfHardwareServiceStub(object):
                 '/mpf.vpe.MpfHardwareService/Start',
                 request_serializer=platform__pb2.MachineState.SerializeToString,
                 response_deserializer=platform__pb2.Commands.FromString,
-                )
+                _registered_method=True)
         self.GetMachineDescription = channel.unary_unary(
                 '/mpf.vpe.MpfHardwareService/GetMachineDescription',
                 request_serializer=platform__pb2.EmptyRequest.SerializeToString,
                 response_deserializer=platform__pb2.MachineDescription.FromString,
-                )
+                _registered_method=True)
         self.SendSwitchChanges = channel.stream_unary(
                 '/mpf.vpe.MpfHardwareService/SendSwitchChanges',
                 request_serializer=platform__pb2.SwitchChanges.SerializeToString,
                 response_deserializer=platform__pb2.EmptyResponse.FromString,
-                )
+                _registered_method=True)
         self.Quit = channel.unary_unary(
                 '/mpf.vpe.MpfHardwareService/Quit',
                 request_serializer=platform__pb2.QuitRequest.SerializeToString,
                 response_deserializer=platform__pb2.EmptyResponse.FromString,
-                )
+                _registered_method=True)
+        self.Ping = channel.unary_unary(
+                '/mpf.vpe.MpfHardwareService/Ping',
+                request_serializer=platform__pb2.EmptyRequest.SerializeToString,
+                response_deserializer=platform__pb2.PingResponse.FromString,
+                _registered_method=True)
 
 
 class MpfHardwareServiceServicer(object):
@@ -63,6 +88,12 @@ class MpfHardwareServiceServicer(object):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def Ping(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
 
 def add_MpfHardwareServiceServicer_to_server(servicer, server):
     rpc_method_handlers = {
@@ -86,10 +117,16 @@ def add_MpfHardwareServiceServicer_to_server(servicer, server):
                     request_deserializer=platform__pb2.QuitRequest.FromString,
                     response_serializer=platform__pb2.EmptyResponse.SerializeToString,
             ),
+            'Ping': grpc.unary_unary_rpc_method_handler(
+                    servicer.Ping,
+                    request_deserializer=platform__pb2.EmptyRequest.FromString,
+                    response_serializer=platform__pb2.PingResponse.SerializeToString,
+            ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
             'mpf.vpe.MpfHardwareService', rpc_method_handlers)
     server.add_generic_rpc_handlers((generic_handler,))
+    server.add_registered_method_handlers('mpf.vpe.MpfHardwareService', rpc_method_handlers)
 
 
  # This class is part of an EXPERIMENTAL API.
@@ -107,11 +144,21 @@ class MpfHardwareService(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_stream(request, target, '/mpf.vpe.MpfHardwareService/Start',
+        return grpc.experimental.unary_stream(
+            request,
+            target,
+            '/mpf.vpe.MpfHardwareService/Start',
             platform__pb2.MachineState.SerializeToString,
             platform__pb2.Commands.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
 
     @staticmethod
     def GetMachineDescription(request,
@@ -124,11 +171,21 @@ class MpfHardwareService(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/mpf.vpe.MpfHardwareService/GetMachineDescription',
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/mpf.vpe.MpfHardwareService/GetMachineDescription',
             platform__pb2.EmptyRequest.SerializeToString,
             platform__pb2.MachineDescription.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
 
     @staticmethod
     def SendSwitchChanges(request_iterator,
@@ -141,11 +198,21 @@ class MpfHardwareService(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.stream_unary(request_iterator, target, '/mpf.vpe.MpfHardwareService/SendSwitchChanges',
+        return grpc.experimental.stream_unary(
+            request_iterator,
+            target,
+            '/mpf.vpe.MpfHardwareService/SendSwitchChanges',
             platform__pb2.SwitchChanges.SerializeToString,
             platform__pb2.EmptyResponse.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
 
     @staticmethod
     def Quit(request,
@@ -158,8 +225,45 @@ class MpfHardwareService(object):
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/mpf.vpe.MpfHardwareService/Quit',
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/mpf.vpe.MpfHardwareService/Quit',
             platform__pb2.QuitRequest.SerializeToString,
             platform__pb2.EmptyResponse.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def Ping(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/mpf.vpe.MpfHardwareService/Ping',
+            platform__pb2.EmptyRequest.SerializeToString,
+            platform__pb2.PingResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)

{mpf-0.80.0.dev13 → mpf-0.80.0.dev14}/mpf/platforms/visual_pinball_engine/protobuf/platform.proto

@@ -7,6 +7,7 @@ service MpfHardwareService {
   rpc GetMachineDescription(EmptyRequest) returns (MachineDescription);
   rpc SendSwitchChanges(stream SwitchChanges) returns (EmptyResponse);
   rpc Quit(QuitRequest) returns (EmptyResponse);
+  rpc Ping(EmptyRequest) returns (PingResponse);
 }
 
 message EmptyRequest {}
@@ -144,3 +145,7 @@ message RemoveHardwareRuleRequest {
   string coil_number = 1;
   string switch_number = 2;
 }
+
+message PingResponse {
+  string mpf_version = 1;
+}

{mpf-0.80.0.dev13 → mpf-0.80.0.dev14}/mpf/platforms/visual_pinball_engine/service.py

@@ -5,6 +5,7 @@ This is separated from the platform because we need to catch a syntax error in p
 import asyncio
 from mpf.platforms.visual_pinball_engine import platform_pb2_grpc
 from mpf.platforms.visual_pinball_engine import platform_pb2
+from mpf._version import __version__
 
 
 class MpfHardwareService(platform_pb2_grpc.MpfHardwareServiceServicer):
@@ -110,3 +111,6 @@ class MpfHardwareService(platform_pb2_grpc.MpfHardwareServiceServicer):
         """Stop MPF."""
         self.machine.stop(reason="VPE exited.")
         return platform_pb2.EmptyResponse()
+
+    async def Ping(self, request, context):
+        return platform_pb2.PingResponse(mpf_version=__version__)

{mpf-0.80.0.dev13 → mpf-0.80.0.dev14}/mpf/tests/machine_files/virtual_pinball/config/config.yaml

@@ -16,6 +16,8 @@ switches:
         number: 0-3
     s_test_card2:
         number: 0-8
+    s_kickback:
+        number: 0-9
 
 coils:
     c_test:
@@ -37,6 +39,9 @@ coils:
     c_holdpower_16:
         number: 1-12
         default_hold_power: 0.0625
+    c_kickback:
+        number: 1-13
+        default_pulse_ms: 20
 
 lights:
   test_light1:
@@ -59,6 +64,13 @@ autofire_coils:
         coil: c_test_allow_enable
         switch: s_test_no_debounce
 
+kickbacks:
+    kickback_test:
+        enable_events: enable_kickback_test
+        coil_pulse_delay: 10ms
+        coil: c_kickback
+        switch: s_kickback
+
 flippers:
     f_test_single:
         debug: true

{mpf-0.80.0.dev13 → mpf-0.80.0.dev14}/mpf/tests/test_Randomizer.py

@@ -216,6 +216,74 @@ class TestRandomizer(MpfTestCase):
         self.assertEqual(50, results.count('2'))
         self.assertEqual(0, results.count('foo'))
 
+    def test_fallback_value_nonrandom(self):
+        # when condition for all items is false, always fall back
+        r = Randomizer([
+                '1{False}',
+                '2{False}',
+            ], self.machine)
+        r.fallback_value = "foo"
+        r.disable_random = True
+
+        results = list()
+        for x in range(10):
+            results.append(next(r))
+
+        self.assertEqual(0, results.count('1'))
+        self.assertEqual(0, results.count('2'))
+        self.assertEqual(10, results.count('foo'))
+
+        # last item is used when all conditional items are false and no fallback is given
+        r = Randomizer([
+                '1{False}',
+                '2{False}',
+                '3{False}',
+            ], self.machine)
+        r.disable_random = True
+
+        results = list()
+        for x in range(10):
+            results.append(next(r))
+
+        self.assertEqual(0, results.count('1'))
+        self.assertEqual(0, results.count('2'))
+        self.assertEqual(10, results.count('3'))
+
+    def test_conditionals_dynamic_updating_no_random(self):
+        # conditionals should loop properly when conditional values change between draws
+        r = Randomizer([
+                '1{machine.foo == 0}',
+                '2{machine.foo == 0}',
+            ],
+                self.machine,
+                template_type="event"
+        )
+        r.fallback_value = "bar"
+        r.disable_random = True
+
+        self.machine.variables.set_machine_var('foo', 0)
+        for i in range(10):
+            self.assertEqual(next(r), '1')
+            self.assertEqual(next(r), '2')
+
+        self.machine.variables.set_machine_var('foo', 1)
+        for i in range(10):
+            self.assertEqual(next(r), 'bar')
+
+        self.machine.variables.set_machine_var('foo', 0)
+        for i in range(10):
+            self.assertEqual(next(r), '1')
+            self.assertEqual(next(r), '2')
+
+        self.machine.variables.set_machine_var('foo', 1)
+        for i in range(10):
+            self.assertEqual(next(r), 'bar')
+
+        self.machine.variables.set_machine_var('foo', 0)
+        for i in range(10):
+            self.assertEqual(next(r), '1')
+            self.assertEqual(next(r), '2')
+
     def test_weights(self):
         # Case 1 - double-weight to one option skews true random draws
         items = [

{mpf-0.80.0.dev13 → mpf-0.80.0.dev14}/mpf/tests/test_VirtualPinball.py

@@ -130,3 +130,45 @@ class TestVirtualPinball(MpfTestCase):
         self._encode_and_send(client, "switch", name="s_test_nc", state=1)
         self.advance_time_and_run()
         self.assertSwitchState("s_test_nc", 1)
+
+        cmd, args = self.loop.run_until_complete(self._get_and_decode(client))
+        self.assertEqual("device", cmd)
+        self.assertEqual("switch", args['type'])
+        self.assertEqual("s_test_nc", args['name'])
+        self.assertEqual(["state", 0, 1], args['changes'])
+        self.assertEqual({'state': 1, 'recycle_jitter_count': 0}, args['state'])
+
+        cmd, args = self.loop.run_until_complete(self._get_and_decode(client))
+        self.assertEqual("switch", cmd)
+        self.assertEqual("s_test_nc", args['name'])
+        self.assertEqual(1, args['state'])
+
+        # Prove that virtual supports delayed kickbacks
+        self.post_event("enable_kickback_test")
+
+        cmd, args = self.loop.run_until_complete(self._get_and_decode(client))
+        cmd, args = self.loop.run_until_complete(self._get_and_decode(client))
+        # Yes you do it twice for some reason (they are the same)
+        self.assertEqual("device", cmd)
+        self.assertEqual("kickback", args['type'])
+        self.assertEqual("kickback_test", args['name'])
+        self.assertEqual(["enabled", False, True], args['changes'])
+        self.assertEqual({"enabled": True}, args['state'])
+
+        cmd, args = self.loop.run_until_complete(self._get_and_decode(client))
+        self.assertEqual("driver_event", cmd)
+        self.assertEqual(args, {
+                'action': 'delayed_pulse_on_hit',
+                'enable_switch_number': '0-9',
+                'enable_switch_name': 's_kickback',
+                'enable_switch_invert': False,
+                'enable_switch_debounce': False,
+                'coil_number': '1-13',
+                'coil_name': 'c_kickback',
+                'coil_pulse_power': 1.0,
+                'coil_pulse_ms': 20,
+                'coil_hold_power': 0,
+                'coil_recycle': True,
+                'delay_ms': 10
+            })
+