From 02f812394d5d4e614b6e93a22bd09a5e932db66a Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 1 Nov 2018 16:13:08 +0200 Subject: Machine Studio v3.5.57 --- .../MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index 01a7ac3da..da5116062 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("3.5.56.18238")] +[assembly: AssemblyVersion("3.5.58.18305")] [assembly: ComVisible(false)] \ No newline at end of file -- cgit v1.3.1 From 6173c696cbb4100d1961cb1077a69a47677e9c3d Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 1 Nov 2018 17:06:56 +0200 Subject: Machine Studio vMachine Studio v3.5.58 --- Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 15400960 -> 15400960 bytes .../Build/Shortcuts/Machine Emulator.lnk | Bin 1471 -> 1471 bytes .../Build/Shortcuts/Machine Studio.lnk | Bin 1532 -> 1532 bytes .../Build/Shortcuts/Proto Compiler GUI.lnk | Bin 1464 -> 1464 bytes .../Properties/AssemblyInfo.cs | 2 +- .../Adapters/UsbTransportAdapter.cs | 22 ++++++++++++--------- 7 files changed, 14 insertions(+), 10 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 799b1cb60..f304fca72 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index b12e09a4d..5583b0caa 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk index 337eb97c3..d27a3b374 100644 Binary files a/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk and b/Software/Visual_Studio/Build/Shortcuts/Machine Emulator.lnk differ diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk index 9beee5a22..822b949f9 100644 Binary files a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk and b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk differ diff --git a/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk b/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk index 97ac24ba6..68815fa62 100644 Binary files a/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk and b/Software/Visual_Studio/Build/Shortcuts/Proto Compiler GUI.lnk differ diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index da5116062..df7efa77f 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("3.5.58.18305")] +[assembly: AssemblyVersion("3.5.59.18305")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Transport/Adapters/UsbTransportAdapter.cs b/Software/Visual_Studio/Tango.Transport/Adapters/UsbTransportAdapter.cs index 83178bb5b..43fa87cf0 100644 --- a/Software/Visual_Studio/Tango.Transport/Adapters/UsbTransportAdapter.cs +++ b/Software/Visual_Studio/Tango.Transport/Adapters/UsbTransportAdapter.cs @@ -144,21 +144,25 @@ namespace Tango.Transport.Adapters _serialPort.DataReceived -= OnSerialPortDataReceived; } - _serialPort.DiscardOutBuffer(); - _serialPort.DiscardInBuffer(); - _serialPort.Close(); + try + { + _serialPort.DiscardOutBuffer(); + _serialPort.DiscardInBuffer(); + _serialPort.Close(); - if (timeout) return; + if (timeout) return; - State = TransportComponentState.Disconnected; - LogManager.Log("USB adapter disconnected."); - completed = true; + State = TransportComponentState.Disconnected; + LogManager.Log("USB adapter disconnected."); + completed = true; + } + catch { } } catch (Exception ex) { completed = true; - throw LogManager.Log(ex, "Could not close serial port on " + Address + "."); + LogManager.Log(ex, "Could not close serial port on " + Address + "."); } }); @@ -167,7 +171,7 @@ namespace Tango.Transport.Adapters if (!completed) { timeout = true; - throw LogManager.Log(new IOException("The serial port seems to be in a froze state. Reinitialize the port and try again.")); + LogManager.Log(new IOException("The serial port seems to be in a froze state. Reinitialize the port and try again.")); } }); -- cgit v1.3.1