Improved ExternalBridge discovery greatly!

Implemented volume gradient generation!

1 files changed, 16 insertions, 1 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 82d805a70..3ffb6f634 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()
@@ -125,7 +132,15 @@ namespace Tango.PPC.Common.Connection
                                 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);