PPC working on tablet !

1 files changed, 23 insertions, 47 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
index 52d738220..340b64765 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
@@ -107,9 +107,7 @@ namespace Tango.PPC.Common.Connection
 
                         var settings = SettingsManager.Default.GetOrCreate<PPCSettings>();
 
-                        var demo = settings.DemoMode;
-
-                        if (!demo)
+                        if (!Machine.IsDemo)
                         {
                             if (String.IsNullOrWhiteSpace(settings.EmbeddedComPort))
                             {
@@ -146,13 +144,15 @@ namespace Tango.PPC.Common.Connection
                         {
                             LogManager.Log("Application in demo mode!");
 
+                            var emulator_channel_name = "emulator-" + Guid.NewGuid().ToString();
+
                             LogManager.Log("Starting embedded emulator...");
-                            MachineEmulator emulator = new MachineEmulator(new BasicTransporter(new MemoryTransportAdapter("emulator")));
+                            MachineEmulator emulator = new MachineEmulator(new BasicTransporter(new MemoryTransportAdapter(emulator_channel_name)));
                             await emulator.Start();
 
                             LogManager.Log("Emulator started. Connecting to emulator...");
 
-                            MemoryTransportAdapter adapter = new MemoryTransportAdapter("emulator");
+                            MemoryTransportAdapter adapter = new MemoryTransportAdapter(emulator_channel_name);
                             MachineOperator.Adapter = adapter;
                             MachineOperator.JobHandlingMode = JobHandlerModes.SettingUp;
                             LogManager.Log("Connecting machine operator...");
@@ -239,59 +239,35 @@ namespace Tango.PPC.Common.Connection
 
             var settings = SettingsManager.Default.GetOrCreate<PPCSettings>();
 
-            var demo = settings.DemoMode;
-
-            if (!demo)
+            if (String.IsNullOrWhiteSpace(settings.EmbeddedComPort))
             {
-                if (String.IsNullOrWhiteSpace(settings.EmbeddedComPort))
-                {
-                    TimeSpan timeout = TimeSpan.FromSeconds(SettingsManager.Default.GetOrCreate<PPCSettings>().MachineScanningTimeoutSeconds);
-
-                    onProgress?.Invoke("Scanning for the machine...");
-                    LogManager.Default.Log("Scanning for machine on available serial ports...");
-                    Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse> scanner = new Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse>(UsbSerialBaudRates.BR_115200);
-                    var response = await scanner.Scan(new ConnectRequest() { Password = "1234" }, timeout);
+                TimeSpan timeout = TimeSpan.FromSeconds(SettingsManager.Default.GetOrCreate<PPCSettings>().MachineScanningTimeoutSeconds);
 
-                    onProgress?.Invoke("Machine discovered on port: " + response.Adapter.Address);
-                    LogManager.Default.Log("Machine discovered on port: " + response.Adapter.Address);
-                    LogManager.Default.Log("Device Information:");
-                    LogManager.Default.Log(response.Response.DeviceInformation.ToJsonString());
+                onProgress?.Invoke("Scanning for the machine...");
+                LogManager.Default.Log("Scanning for machine on available serial ports...");
+                Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse> scanner = new Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse>(UsbSerialBaudRates.BR_115200);
+                var response = await scanner.Scan(new ConnectRequest() { Password = "1234" }, timeout);
 
-                    machineOperator.Adapter = response.Adapter;
-                    machineOperator.JobHandlingMode = JobHandlerModes.SettingUp;
-                    LogManager.Default.Log("Connecting machine operator...");
+                onProgress?.Invoke("Machine discovered on port: " + response.Adapter.Address);
+                LogManager.Default.Log("Machine discovered on port: " + response.Adapter.Address);
+                LogManager.Default.Log("Device Information:");
+                LogManager.Default.Log(response.Response.DeviceInformation.ToJsonString());
 
-                    onProgress?.Invoke("Connecting machine operator...");
-                    await machineOperator.Connect();
-                }
-                else
-                {
-                    LogManager.Default.Log($"Connecting to machine on {settings.EmbeddedComPort}...");
+                machineOperator.Adapter = response.Adapter;
+                machineOperator.JobHandlingMode = JobHandlerModes.SettingUp;
+                LogManager.Default.Log("Connecting machine operator...");
 
-                    onProgress?.Invoke($"Connecting to machine on {settings.EmbeddedComPort}...");
-                    UsbTransportAdapter adapter = new UsbTransportAdapter(settings.EmbeddedComPort, UsbSerialBaudRates.BR_115200);
-                    machineOperator.Adapter = adapter;
-                    machineOperator.JobHandlingMode = JobHandlerModes.SettingUp;
-                    await machineOperator.Connect();
-                }
+                onProgress?.Invoke("Connecting machine operator...");
+                await machineOperator.Connect();
             }
             else
             {
-                LogManager.Default.Log("Application in demo mode!");
-
-                onProgress?.Invoke("Application in demo mode, Starting embedded emulator...");
+                LogManager.Default.Log($"Connecting to machine on {settings.EmbeddedComPort}...");
 
-                LogManager.Default.Log("Starting embedded emulator...");
-                MachineEmulator emulator = new MachineEmulator(new BasicTransporter(new MemoryTransportAdapter("emulator")));
-                await emulator.Start();
-
-                LogManager.Default.Log("Emulator started. Connecting to emulator...");
-
-                MemoryTransportAdapter adapter = new MemoryTransportAdapter("emulator");
+                onProgress?.Invoke($"Connecting to machine on {settings.EmbeddedComPort}...");
+                UsbTransportAdapter adapter = new UsbTransportAdapter(settings.EmbeddedComPort, UsbSerialBaudRates.BR_115200);
                 machineOperator.Adapter = adapter;
                 machineOperator.JobHandlingMode = JobHandlerModes.SettingUp;
-                LogManager.Default.Log("Connecting machine operator...");
-                onProgress?.Invoke("Connecting machine operator...");
                 await machineOperator.Connect();
             }