diff options
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels')
2 files changed, 3 insertions, 9 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs index 1b09e5735..511733984 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs @@ -128,13 +128,8 @@ namespace Tango.MachineStudio.UI.ViewModels _scanner.AvailableMachines.Add(_emulator); } - if (_firmwareTcpClient != null) - { - await _firmwareTcpClient.Disconnect(); - - _firmwareTcpClient = new ExternalBridgeTcpFirmwareClient(); - _scanner.AvailableMachines.Add(_firmwareTcpClient); - } + _firmwareTcpClient = new ExternalBridgeTcpFirmwareClient(); + _scanner.AvailableMachines.Add(_firmwareTcpClient); _scanner.Start(); } diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs index 0550383fb..70888564b 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs @@ -478,13 +478,12 @@ namespace Tango.MachineStudio.UI.ViewModels x.SelectedMachine.JobUnitsMethod = _settings.JobUnitsMethod; x.SelectedMachine.JobRunsLogger.JobSource = BL.Enumerations.JobSource.Remote; - if (x.SelectedMachine is ExternalBridgeTcpClient) + if (x.SelectedMachine is ExternalBridgeTcpClient && x.SelectedMachine.GetType() != typeof(ExternalBridgeTcpFirmwareClient)) { x.SelectedMachine.As<ExternalBridgeTcpClient>().EnableApplicationLogs = x.EnableApplicationLogs; x.SelectedMachine.RequestTimeout = _settings.ExternalBridgeRequestTimeout; x.SelectedMachine.ContinuousRequestTimeout = _settings.ExternalBridgeContinuousRequestTimeout; } - if (x.SelectedMachine.Adapter is TcpTransportAdapter) { (x.SelectedMachine.Adapter as TcpTransportAdapter).WriteMode = _settings.TcpTransportAdapterWriteMode; |