nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove try/catch from TcpipSerialPort.Open

Browse source 
- Allow exceptions to bubble to caller
- Issue MatterHackers/MCCentral#5271
TcpipSerialPort should not suppress connection failures
This commit is contained in:
jlewin 2019-04-05 16:22:56 -07:00
parent 1915bdf165
commit cf06e19106
1 changed files with 14 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

38
MatterControlLib/PrinterCommunication/Drivers/TCPIP/TcpipSerialPort.cs
View file

@ -151,35 +151,25 @@ namespace TcpipDriver
public void Open()
{
try
this.LogInfo("Attempting to connect to: " + ipEndPoint.Address + " on port " + ipEndPoint.Port);
socket.Connect(ipEndPoint);
stream = new NetworkStream(socket)
{
// Attempt to connect Message to just the console
this.LogInfo("Attempting to connect to: " + ipEndPoint.Address + " on port " + ipEndPoint.Port);
socket.Connect(ipEndPoint);
WriteTimeout = tempWriteTimeout,
ReadTimeout = tempReadTimeout
};
stream = new NetworkStream(socket)
{
WriteTimeout = tempWriteTimeout,
ReadTimeout = tempReadTimeout
};
this.LogInfo("Connected to: " + ipEndPoint.Address + " on port " + ipEndPoint.Port);
if (this.BaudRate != 0)
{
//Send Telnet handshake so that esp will enter the telnet mode allowing us to set baud and reset board
byte[] bytes = new byte[] { IAC, WILL, ComPortOpt };
Write(bytes, 0, bytes.Length);
//Set baud and reset board
SetBaudRate(this.BaudRate);
}
}
catch (Exception e)
this.LogInfo("Connected to: " + ipEndPoint.Address + " on port " + ipEndPoint.Port);
if (this.BaudRate != 0)
{
ApplicationController.Instance.LogError("Exception:" + e.Message);
//Send Telnet handshake so that esp will enter the telnet mode allowing us to set baud and reset board
byte[] bytes = new byte[] { IAC, WILL, ComPortOpt };
Write(bytes, 0, bytes.Length);
//Set baud and reset board
SetBaudRate(this.BaudRate);
}
}
private void LogInfo(string message)
{
ApplicationController.Instance.LogInfo(message);