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

Remove ActiveSliceSettings.Instance

Browse source 
- Issue MatterHackers/MCCentral#4243
This commit is contained in:
John Lewin 2018-10-05 09:24:57 -07:00
parent d8a5100639
commit 6dbae7668b
32 changed files with 153 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -43,14 +43,17 @@ namespace TcpipDriver
private bool reconnecting = false;
PrinterConnection printerConnection;
private PrinterConfig printer;
public TcpipSerialPort(PrinterConnection printerConnection, string name)
public TcpipSerialPort(PrinterConfig printer, string name)
{
this.printerConnection = printerConnection;
this.printer = printer;
this.printerConnection = printer.Connection;
socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
if (int.TryParse(ActiveSliceSettings.Instance.GetValue("ip_port"), out port)
&& IPAddress.TryParse(ActiveSliceSettings.Instance.GetValue("ip_address"), out ipAddress))
if (int.TryParse(printer.Settings.GetValue("ip_port"), out port)
&& IPAddress.TryParse(printer.Settings.GetValue("ip_address"), out ipAddress))
{
ipEndPoint = new IPEndPoint(ipAddress, port);
readBuffer = new byte[1024];