luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Critial Bug Fix in Connector. Samples Bug Fix.

Browse Source
This commit is contained in:
luosheng
2023-02-15 16:18:57 +08:00
parent b880acff6d
commit af928c5932
313 changed files with 84 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modbus.Net/Modbus.Net.Modbus/ModbusMachine.cs
View File

@@ -44,7 +44,7 @@ namespace Modbus.Net.Modbus
public ModbusMachine(TKey id, ModbusType connectionType, string connectionString,
IEnumerable<AddressUnit<TUnitKey>> getAddresses, byte slaveAddress, byte masterAddress,
Endian endian = Endian.BigEndianLsb)
: this(id, connectionType, connectionString, getAddresses, false, slaveAddress, masterAddress, endian)
: this(id, connectionType, connectionString, getAddresses, true, slaveAddress, masterAddress, endian)
{
}
}
@@ -89,7 +89,7 @@ namespace Modbus.Net.Modbus
public ModbusMachine(string id, ModbusType connectionType, string connectionString,
IEnumerable<AddressUnit> getAddresses, byte slaveAddress, byte masterAddress,
Endian endian = Endian.BigEndianLsb)
: this(id, connectionType, connectionString, getAddresses, false, slaveAddress, masterAddress, endian)
: this(id, connectionType, connectionString, getAddresses, true, slaveAddress, masterAddress, endian)
{
}
}

4
Modbus.Net/Modbus.Net.Siemens/SiemensMachine.cs
View File

@@ -46,7 +46,7 @@ namespace Modbus.Net.Siemens
/// <param name="dst">PLC模块位，0到7，仅200使用，其它型号不要填写</param>
public SiemensMachine(TKey id, SiemensType connectionType, string connectionString, SiemensMachineModel model,
IEnumerable<AddressUnit<TUnitKey>> getAddresses, byte slaveAddress, byte masterAddress, byte src = 1, byte dst = 0)
: this(id, connectionType, connectionString, model, getAddresses, false, slaveAddress, masterAddress, src, dst)
: this(id, connectionType, connectionString, model, getAddresses, true, slaveAddress, masterAddress, src, dst)
{
}
}
@@ -93,7 +93,7 @@ namespace Modbus.Net.Siemens
/// <param name="dst">PLC模块位，0到7，仅200使用，其它型号不要填写</param>
public SiemensMachine(string id, SiemensType connectionType, string connectionString, SiemensMachineModel model,
IEnumerable<AddressUnit> getAddresses, byte slaveAddress, byte masterAddress, byte src = 1, byte dst = 0)
: this(id, connectionType, connectionString, model, getAddresses, false, slaveAddress, masterAddress, src, dst)
: this(id, connectionType, connectionString, model, getAddresses, true, slaveAddress, masterAddress, src, dst)
{
}
}

27
Modbus.Net/Modbus.Net/Connector/TcpConnector.cs
View File

@@ -87,20 +87,16 @@ namespace Modbus.Net
/// <param name="disposing"></param>
protected virtual void Dispose(bool disposing)
{
if (!m_disposed)
if (disposing)
{
if (disposing)
{
// Release managed resources
}
// Release unmanaged resources
if (_socketClient != null)
{
CloseClientSocket();
_socketClient = null;
Log.Debug("Tcp client {ConnectionToken} Disposed", ConnectionToken);
}
m_disposed = true;
// Release managed resources
}
// Release unmanaged resources
if (_socketClient != null)
{
CloseClientSocket();
_socketClient = null;
Log.Debug("Tcp client {ConnectionToken} Disposed", ConnectionToken);
}
}
@@ -312,9 +308,8 @@ namespace Modbus.Net
{
if (_socketClient.Connected)
{
_socketClient.GetStream().Dispose();
}
_socketClient?.Close();
_socketClient.Close();
}
}
}
catch (Exception ex)

24
Modbus.Net/Modbus.Net/Connector/UdpConnector.cs
View File

@@ -28,8 +28,6 @@ namespace Modbus.Net
private UdpClient _socketClient;
private bool m_disposed;
private Task _receiveThread;
private bool _taskCancel = false;
@@ -74,20 +72,16 @@ namespace Modbus.Net
/// <param name="disposing"></param>
protected virtual void Dispose(bool disposing)
{
if (!m_disposed)
if (disposing)
{
if (disposing)
{
// Release managed resources
}
// Release unmanaged resources
if (_socketClient != null)
{
CloseClientSocket();
_socketClient = null;
Log.Debug("Udp client {ConnectionToken} Disposed", ConnectionToken);
}
m_disposed = true;
// Release managed resources
}
// Release unmanaged resources
if (_socketClient != null)
{
CloseClientSocket();
_socketClient = null;
Log.Debug("Udp client {ConnectionToken} Disposed", ConnectionToken);
}
}