Moved android project and new project.

Visual Studio Timeout Task!

1 files changed, 29 insertions, 14 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 b87773e1f..a4932eafc 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
@@ -17,6 +17,7 @@ using Tango.Core.DI;
 using Tango.PPC.Common.Messages;
 using Tango.Emulations.Emulators;
 using Tango.Transport.Transporters;
+using Tango.Integration;
 
 namespace Tango.PPC.Common.Connection
 {
@@ -125,26 +126,40 @@ namespace Tango.PPC.Common.Connection
             {
                 LogManager.Log("Starting machine connection procedure...");
 
-                var demo = SettingsManager.Default.GetOrCreate<PPCSettings>().DemoMode;
+                var settings = SettingsManager.Default.GetOrCreate<PPCSettings>();
+
+                var demo = settings.DemoMode;
 
                 if (!demo)
                 {
-                    TimeSpan timeout = TimeSpan.FromSeconds(SettingsManager.Default.GetOrCreate<PPCSettings>().MachineScanningTimeoutSeconds);
+                    if (String.IsNullOrWhiteSpace(settings.EmbeddedComPort))
+                    {
+                        TimeSpan timeout = TimeSpan.FromSeconds(SettingsManager.Default.GetOrCreate<PPCSettings>().MachineScanningTimeoutSeconds);
 
-                    LogManager.Log("Scanning for machine on available serial ports...");
-                    Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse> scanner = new Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse>(UsbSerialBaudRates.BR_9600);
-                    var response = await scanner.Scan(new ConnectRequest() { Password = "1234" }, timeout);
+                        LogManager.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);
 
-                    LogManager.Log("Machine discovered on port: " + response.Adapter.Address);
-                    LogManager.Log("Device Information:");
-                    LogManager.Log(response.Response.DeviceInformation.ToJsonString());
+                        LogManager.Log("Machine discovered on port: " + response.Adapter.Address);
+                        LogManager.Log("Device Information:");
+                        LogManager.Log(response.Response.DeviceInformation.ToJsonString());
 
-                    LogManager.Log("Disconnecting machine operator...");
-                    await MachineOperator.Disconnect();
-                    MachineOperator.Adapter = response.Adapter;
-                    MachineOperator.JobHandlingMode = JobHandlerModes.SettingUp;
-                    LogManager.Log("Connecting machine operator...");
-                    await MachineOperator.Connect();
+                        LogManager.Log("Disconnecting machine operator...");
+                        await MachineOperator.Disconnect();
+                        MachineOperator.Adapter = response.Adapter;
+                        MachineOperator.JobHandlingMode = JobHandlerModes.SettingUp;
+                        LogManager.Log("Connecting machine operator...");
+                        await MachineOperator.Connect();
+                    }
+                    else
+                    {
+                        LogManager.Log($"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();
+                    }
                 }
                 else
                 {