Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 5 insertions, 1 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
index 65ee12124..4978fa6e0 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -17,6 +17,7 @@ using Tango.Core.Helpers;
 using Tango.PPC.Common.Modules;
 using System.Windows.Threading;
 using Tango.Transport.Adapters;
+using Tango.PMR.Connection;
 
 namespace Tango.PPC.UI.PPCApplication
 {
@@ -192,7 +193,10 @@ namespace Tango.PPC.UI.PPCApplication
 
         private async void ConnectToMachine()
         {
-            var machine = new MachineOperator(new UsbTransportAdapter("COM3", UsbSerialBaudRates.BR_9600));
+            Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse> scanner = new Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse>(UsbSerialBaudRates.BR_9600);
+            var response = await scanner.Scan(new ConnectRequest() { Password = "1234" }, TimeSpan.FromSeconds(60));
+
+            var machine = new MachineOperator(response.Adapter);
             await machine.Connect();
             ConnectedMachine = machine;
         }