merge alarm handling from remote

1 files changed, 33 insertions, 10 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 9a7e29bb7..61ddfdb2b 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
@@ -79,6 +79,13 @@ namespace Tango.PPC.Common.Connection
             MachineOperator.UseKeepAlive = true;
             MachineOperator.EnableDiagnostics = false;
             MachineOperator.EnableEmbeddedDebugging = false;
+
+            var settings = SettingsManager.Default.GetOrCreate<PPCSettings>();
+
+            MachineOperator.JobUploadStrategy = settings.JobUploadStrategy;
+
+            MachineOperator.GradientGenerationConfiguration.IsEnabled = settings.EnableGradientGeneration;
+            MachineOperator.GradientGenerationConfiguration.ResolutionCM = settings.GradientGenerationResolution;
         }
 
         private async void ConnectionThreadMethod()
@@ -89,7 +96,7 @@ namespace Tango.PPC.Common.Connection
                 {
                     try
                     {
-                        LogManager.Log("Starting machine connection procedure...");
+                        LogManager.Log("Starting machine connection procedure...", LogCategory.Debug);
 
                         var settings = SettingsManager.Default.GetOrCreate<PPCSettings>();
 
@@ -99,20 +106,28 @@ namespace Tango.PPC.Common.Connection
                             {
                                 TimeSpan timeout = TimeSpan.FromSeconds(SettingsManager.Default.GetOrCreate<PPCSettings>().MachineScanningTimeoutSeconds);
 
-                                LogManager.Log("Scanning for machine on available serial ports...");
+                                LogManager.Log("Scanning for machine on available serial ports...", LogCategory.Debug);
                                 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, LogCategory.Debug);
+                                LogManager.Log("Device Information:", LogCategory.Debug);
+                                LogManager.Log(response.Response.DeviceInformation.ToJsonString(), LogCategory.Debug);
 
-                                LogManager.Log("Disconnecting machine operator...");
+                                LogManager.Log("Disconnecting machine operator...", LogCategory.Debug);
                                 await MachineOperator.Disconnect();
                                 MachineOperator.Adapter = response.Adapter;
                                 MachineOperator.JobHandlingMode = JobHandlerModes.SettingUp;
-                                LogManager.Log("Connecting machine operator...");
-                                await MachineOperator.Connect();
+                                LogManager.Log("Connecting machine operator...", LogCategory.Debug);
+                                try
+                                {
+                                    await MachineOperator.Connect();
+                                }
+                                catch (Exception)
+                                {
+                                    await response.Adapter.Disconnect();
+                                    throw;
+                                }
 
 
                                 await Task.Delay(1000);
@@ -120,12 +135,20 @@ namespace Tango.PPC.Common.Connection
                             }
                             else
                             {
-                                LogManager.Log($"Connecting to machine on {settings.EmbeddedComPort}...");
+                                LogManager.Log($"Connecting to machine on {settings.EmbeddedComPort}...", LogCategory.Debug);
 
                                 UsbTransportAdapter adapter = new UsbTransportAdapter(settings.EmbeddedComPort, UsbSerialBaudRates.BR_115200);
                                 MachineOperator.Adapter = adapter;
                                 MachineOperator.JobHandlingMode = JobHandlerModes.SettingUp;
-                                await MachineOperator.Connect();
+                                try
+                                {
+                                    await MachineOperator.Connect();
+                                }
+                                catch (Exception)
+                                {
+                                    await adapter.Disconnect();
+                                    throw;
+                                }
 
                                 await Task.Delay(1000);
                                 await MachineOperator.UploadHardwareConfiguration(Machine.Configuration.HardwareVersion, Machine.Configuration);