config: Add tutorial config and subscribe to stream events.

Author: freezy

.gitignore

@@ -30,6 +30,7 @@ bld/
 [Oo]bj/
 [Ll]og/
 [Ll]ogs/
+lsp/
 
 # Visual Studio 2015/2017 cache/options directory
 .vs/
@@ -351,3 +352,4 @@ MigrationBackup/
 .idea/
 
 **/protos/*.cs
+**/Plugins/*/*.meta

VisualPinball.Engine.Mpf.Test/Program.cs

@@ -12,7 +12,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq.Expressions;
+using System.Linq;
 using System.Threading.Tasks;
 using VisualPinball.Engine.Mpf;
 
@@ -40,6 +40,27 @@ public static async Task Main(string[] args)
 			mpfApi.StartGame(new Dictionary<string, bool> {
 				{"sw_11", false},
 			});
+			mpfApi.Client.OnConfigureHardwareRule += (_, request) => {
+				Console.WriteLine($"[MPF] configure hw/rule: sw{request.SwitchNumber} -> c{request.CoilNumber} @{request.HoldPower} | pulse: {request.PulseMs}ms @{request.PulsePower}");
+			};
+			mpfApi.Client.OnRemoveHardwareRule += (_, request) => {
+				Console.WriteLine($"[MPF] remove hw/rule: sw{request.SwitchNumber} -> c{request.CoilNumber}");
+			};
+			mpfApi.Client.OnEnableCoil += (_, request) => {
+				Console.WriteLine($"[MPF] enable coil c{request.CoilNumber} @{request.HoldPower} | pulse: {request.PulseMs}ms @{request.PulsePower}");
+			};
+			mpfApi.Client.OnDisableCoil += (_, request) => {
+				Console.WriteLine($"[MPF] disable coil c{request.CoilNumber}");
+			};
+			mpfApi.Client.OnPulseCoil += (_, request) => {
+				Console.WriteLine($"[MPF] pulse coil c{request.CoilNumber} {request.PulseMs}ms @{request.PulsePower}");
+			};
+			mpfApi.Client.OnFadeLight += (_, request) => {
+				Console.WriteLine($"[MPF] light fades ({request.CommonFadeMs}ms):");
+				foreach (var fade in request.Fades.ToList()) {
+					Console.WriteLine($"  l{fade.LightNumber} @{fade.TargetBrightness}");
+				}
+			};
 
 			var descr = mpfApi.GetMachineDescription();
 			Console.WriteLine($"Description: {descr} in {s.ElapsedMilliseconds}ms");
@@ -49,10 +70,10 @@ public static async Task Main(string[] args)
 				key = Console.ReadKey();
 				switch (key.Key) {
 					case ConsoleKey.A:
-						await mpfApi.Switch("s_sling", true);
+						await mpfApi.Switch("0", true);
 						break;
 					case ConsoleKey.S:
-						await mpfApi.Switch("s_sling", false);
+						await mpfApi.Switch("1", false);
 						break;
 				}
 			} while (key.Key != ConsoleKey.Escape);

VisualPinball.Engine.Mpf.Test/VisualPinball.Engine.Mpf.Test.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

VisualPinball.Engine.Mpf.Unity/Editor/MpfGamelogicEngineInspector.cs

@@ -26,15 +26,27 @@ private void OnEnable()
 
 		public override void OnInspectorGUI()
 		{
-			if (GUILayout.Button("Connect")) {
-				_mpfEngine.Client.Connect();
-			}
-			if (GUILayout.Button("StartGame")) {
-				_mpfEngine.Client.Play();
+			var pos = EditorGUILayout.GetControlRect(true, 18f);
+			pos = EditorGUI.PrefixLabel(pos, new GUIContent("Machine Folder"));
+
+			if (GUI.Button(pos, _mpfEngine.MachineFolder, EditorStyles.objectField)) {
+				var path = EditorUtility.OpenFolderPanel("Mission Pinball Framework: Choose machine folder", _mpfEngine.MachineFolder, "");
+				if (!string.IsNullOrWhiteSpace(path)) {
+					_mpfEngine.MachineFolder = path;
+				}
 			}
-			if (GUILayout.Button("GetMachineDescription")) {
-				Debug.Log(_mpfEngine.Client.GetMachineDescription());
+
+			if (GUILayout.Button("Synchronize")) {
+				_mpfEngine.GetMachineDescription();
 			}
+
+
+			// if (GUILayout.Button("StartGame")) {
+			// 	_mpfEngine.Client.Play();
+			// }
+			// if (GUILayout.Button("GetMachineDescription")) {
+			// 	Debug.Log(_mpfEngine.Client.GetMachineDescription());
+			// }
 		}
 	}
 }

VisualPinball.Engine.Mpf.Unity/Editor/VisualPinball.Engine.Mpf.Unity.Editor.asmdef

@@ -3,6 +3,7 @@
 	"rootNamespace": "VisualPinball.Engine.Mpf.Unity.Editor",
 	"references": [
 		"VisualPinball.Unity",
+		"VisualPinball.Unity.Editor",
 		"VisualPinball.Engine.Mpf.Unity"
 	],
 	"includePlatforms": [ "Editor" ],

VisualPinball.Engine.Mpf.Unity/README.md.meta

@@ -26,5 +26,15 @@ public class MpfGamelogicEngine : MonoBehaviour
 		[NonSerialized]
 		public MpfClient Client = new MpfClient();
 
+		public string MachineFolder;
+
+		public void GetMachineDescription()
+		{
+			var client = new MpfClient();
+			client.Connect();
+			client.StartGame(new Dictionary<string, bool>());
+			Debug.Log("Description = " + client.GetMachineDescription());
+		}
+
 	}
 }

VisualPinball.Engine.Mpf.Unity/Runtime/MpfGamelogicEngine.cs

@@ -19,7 +19,7 @@ namespace VisualPinball.Engine.Mpf
 {
 	public class MpfApi : IDisposable
 	{
-		private readonly MpfClient _client = new MpfClient();
+		public readonly MpfClient Client = new MpfClient();
 		private readonly MpfSpawner _spawner;
 
 		public MpfApi(string machineFolder)
@@ -35,7 +35,7 @@ public MpfApi(string machineFolder)
 		public void Launch(int port = 50051)
 		{
 			_spawner.Spawn();
-			_client.Connect($"localhost:{port}");
+			Client.Connect($"localhost:{port}");
 		}
 
 		/// <summary>
@@ -44,25 +44,25 @@ public void Launch(int port = 50051)
 		/// <param name="initialSwitches">Initial switch states of the machine</param>
 		public void StartGame(Dictionary<string, bool> initialSwitches = null)
 		{
-			_client.StartGame(initialSwitches ?? new Dictionary<string, bool>());
+			Client.StartGame(initialSwitches ?? new Dictionary<string, bool>());
 		}
 
 		/// <summary>
 		/// Returns the machine description.
 		/// </summary>
 		public MachineDescription GetMachineDescription()
 		{
-			return _client.GetMachineDescription();
+			return Client.GetMachineDescription();
 		}
 
 		public async Task Switch(string swName, bool swValue)
 		{
-			await _client.Switch(swName, swValue);
+			await Client.Switch(swName, swValue);
 		}
 
 		public void Dispose()
 		{
-			_client?.Shutdown();
+			Client?.Shutdown();
 		}
 	}
 }

VisualPinball.Engine.Mpf/MpfApi.cs

@@ -101,7 +101,6 @@ private async void ReceiveCommands(MachineState ms)
 					default:
 						throw new ArgumentOutOfRangeException();
 				}
-				Logger.Info($"{count} commands dispatched.");
 			}
 		}
 

VisualPinball.Engine.Mpf/MpfClient.cs

@@ -12,36 +12,82 @@ vpe:
   debug: True
 
 switches:
-  s_sling:
+  s_left_flipper:
     number: 0
-  s_flipper:
-    number: 3
-  s_test:
-    number: 6
+    tags: left_flipper
+  s_right_flipper:
+    number: 1
+    tags: right_flipper
 
 coils:
-  c_sling:
+  c_flipper_left_main:
     number: 0
-  c_flipper:
+  c_flipper_left_hold:
     number: 1
-    allow_enable: True
-  c_test:
+    allow_enable: true
+  c_flipper_right_main:
     number: 2
-    allow_enable: True
-
-lights:
-  test_light1:
-    number: 0
-  test_light2:
-    number: 1
+  c_flipper_right_hold:
+    number: 3
+    allow_enable: true
 
-autofire_coils:
-  ac_slingshot_test:
-    coil: c_sling
-    switch: s_sling
 
 flippers:
-  f_test:
-    main_coil: c_flipper
-    activation_switch: s_flipper
+  left_flipper:
+    main_coil: c_flipper_left_main
+    hold_coil: c_flipper_left_hold
+    activation_switch: s_left_flipper
+    enable_events: machine_reset_phase_3
+  right_flipper:
+    main_coil: c_flipper_right_main
+    hold_coil: c_flipper_right_hold
+    activation_switch: s_right_flipper
+    enable_events: machine_reset_phase_3
+
+
 
+#hardware:
+#  platform: visual_pinball_engine
+#
+#playfields:
+#  playfield:
+#    tags: default
+#    default_source_device: None
+#
+#vpe:
+#  debug: True
+#
+#switches:
+#  s_sling:
+#    number: 0
+#  s_flipper:
+#    number: 3
+#  s_test:
+#    number: 6
+#
+#coils:
+#  c_sling:
+#    number: 0
+#  c_flipper:
+#    number: 1
+#    allow_enable: True
+#  c_test:
+#    number: 2
+#    allow_enable: True
+#
+#lights:
+#  test_light1:
+#    number: 0
+#  test_light2:
+#    number: 1
+#
+#autofire_coils:
+#  ac_slingshot_test:
+#    coil: c_sling
+#    switch: s_sling
+#
+#flippers:
+#  f_test:
+#    main_coil: c_flipper
+#    activation_switch: s_flipper
+#