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

1 files changed, 10 insertions, 1 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
index 22da5c57e..3c70e0744 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
@@ -15,6 +15,7 @@ using Tango.Core;
 using Tango.Core.DB;
 using Tango.Core.Helpers;
 using Tango.Core.IO;
+using Tango.Integration.Operation;
 using Tango.PMR.Synchronization;
 using Tango.PPC.Common.Application;
 using Tango.PPC.Common.Connection;
@@ -73,6 +74,15 @@ namespace Tango.PPC.Common.MachineSetup
             {
                 LogManager.Log($"Starting machine setup for serial number {serialNumber}...");
 
+                //Connecting to machine...
+                LogManager.Log("Initiating machine connection...");
+
+                UpdateProgress("Connecting to machine", "Connecting...");
+                IMachineOperator op = await DefaultMachineProvider.CreateMinimalMachineOperator((msg) =>
+                {
+                    UpdateProgress("Connecting to machine", msg);
+                });
+
                 //Connect to machine service and get matching packages for this machine.
                 UpdateProgress("Downloading software package", "Connecting to machine service...");
 
@@ -233,7 +243,6 @@ namespace Tango.PPC.Common.MachineSetup
                 LogManager.Log("");
                 LogManager.Log("-------------------------------------------------------------------------");
                 LogManager.Log("Updating Firmware...");
-                var op = await DefaultMachineProvider.CreateMinimalMachineOperator();
 
                 UpdateProgress("Updating Firmware", "Loading firmware package...");
                 var tfpPath = Path.Combine(_newPackageTempFolder, "firmware_package.tfp");