1 files changed, 5 insertions, 5 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 bef18e15b..a5fb92959 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
@@ -186,7 +186,7 @@ namespace Tango.PPC.Common.Connection
                                 TimeSpan timeout = TimeSpan.FromSeconds(SettingsManager.Default.GetOrCreate<PPCSettings>().MachineScanningTimeoutSeconds);
 
                                 LogManager.Log("Scanning for machine on available serial ports...", LogCategory.Info);
-                                Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse> scanner = new Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse>(UsbSerialBaudRates.BR_115200);
+                                Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse> scanner = new Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse>(settings.EmbeddedBaudRate);
                                 var response = await scanner.Scan(new ConnectRequest() { Password = "1234" }, settings.EmbeddedDeviceHint, timeout);
 
                                 LogManager.Log("Machine discovered on port: " + response.Adapter.Address, LogCategory.Info);
@@ -224,7 +224,7 @@ namespace Tango.PPC.Common.Connection
                                 //Perform a pre-test to not overload the log file when machine is off for a long time.
                                 using (SerialPort preCheckSerialPort = new SerialPort(settings.EmbeddedComPort))
                                 {
-                                    preCheckSerialPort.BaudRate = UsbSerialBaudRates.BR_115200.ToInt32();
+                                    preCheckSerialPort.BaudRate = settings.EmbeddedBaudRate.ToInt32();
                                     preCheckSerialPort.Open();
                                     preCheckSerialPort.Close();
                                     fileLoggingDisabled = false;
@@ -233,7 +233,7 @@ namespace Tango.PPC.Common.Connection
 
                                 LogManager.Log($"Connecting to machine on {settings.EmbeddedComPort}...", LogCategory.Info);
 
-                                UsbTransportAdapter adapter = new UsbTransportAdapter(settings.EmbeddedComPort, UsbSerialBaudRates.BR_115200);
+                                UsbTransportAdapter adapter = new UsbTransportAdapter(settings.EmbeddedComPort, settings.EmbeddedBaudRate);
                                 MachineOperator.Adapter = adapter;
                                 MachineOperator.JobHandlingMode = JobHandlerModes.SettingUp;
                                 try
@@ -393,7 +393,7 @@ namespace Tango.PPC.Common.Connection
 
                 onProgress?.Invoke("Scanning for the machine...");
                 LogManager.Default.Log("Scanning for machine on available serial ports...");
-                Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse> scanner = new Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse>(UsbSerialBaudRates.BR_115200);
+                Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse> scanner = new Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse>(settings.EmbeddedBaudRate);
                 var response = await scanner.Scan(new ConnectRequest() { Password = "1234" }, timeout);
 
                 onProgress?.Invoke("Machine discovered on port: " + response.Adapter.Address);
@@ -413,7 +413,7 @@ namespace Tango.PPC.Common.Connection
                 LogManager.Default.Log($"Connecting to machine on {settings.EmbeddedComPort}...");
 
                 onProgress?.Invoke($"Connecting to machine on {settings.EmbeddedComPort}...");
-                UsbTransportAdapter adapter = new UsbTransportAdapter(settings.EmbeddedComPort, UsbSerialBaudRates.BR_115200);
+                UsbTransportAdapter adapter = new UsbTransportAdapter(settings.EmbeddedComPort, settings.EmbeddedBaudRate);
                 machineOperator.Adapter = adapter;
                 machineOperator.JobHandlingMode = JobHandlerModes.SettingUp;
                 await machineOperator.Connect();