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

Change Log to Hex.

Browse Source
This commit is contained in:
parallelbgls
2017-08-15 14:26:57 +08:00
parent 5029cad856
commit 4364f246f0
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Modbus.Net/Modbus.Net/ComConnector.cs
View File

@@ -459,7 +459,7 @@ namespace Modbus.Net
Log.Verbose("Com client {ConnectionToken} send msg length: {Length}", ConnectionToken, Log.Verbose("Com client {ConnectionToken} send msg length: {Length}", ConnectionToken,
sendbytes.Length); sendbytes.Length);
Log.Verbose( Log.Verbose(
$"Com client {ConnectionToken} send msg: {String.Concat(sendbytes.Select(p => " " + p))}"); $"Com client {ConnectionToken} send msg: {String.Concat(sendbytes.Select(p => " " + p.ToString("X2")))}");
SerialPort.Write(sendbytes, 0, sendbytes.Length); SerialPort.Write(sendbytes, 0, sendbytes.Length);
} }
catch (Exception err) catch (Exception err)
@@ -475,7 +475,7 @@ namespace Modbus.Net
Log.Verbose("Com client {ConnectionToken} receive msg length: {Length}", ConnectionToken, Log.Verbose("Com client {ConnectionToken} receive msg length: {Length}", ConnectionToken,
returnBytes.Length); returnBytes.Length);
Log.Verbose( Log.Verbose(
$"Com client {ConnectionToken} receive msg: {String.Concat(returnBytes.Select(p => " " + p))}"); $"Com client {ConnectionToken} receive msg: {String.Concat(returnBytes.Select(p => " " + p.ToString("X2")))}");
} }
catch (Exception e) catch (Exception e)
{ {
@@ -531,7 +531,7 @@ namespace Modbus.Net
Log.Verbose("Com client {ConnectionToken} send msg length: {Length}", ConnectionToken, Log.Verbose("Com client {ConnectionToken} send msg length: {Length}", ConnectionToken,
sendbytes.Length); sendbytes.Length);
Log.Verbose( Log.Verbose(
$"Com client {ConnectionToken} send msg: {string.Concat(sendbytes.Select(p => " " + p))}"); $"Com client {ConnectionToken} send msg: {string.Concat(sendbytes.Select(p => " " + p.ToString("X2")))}");
SerialPort.Write(sendbytes, 0, sendbytes.Length); SerialPort.Write(sendbytes, 0, sendbytes.Length);
} }
catch (Exception err) catch (Exception err)

6
Modbus.Net/src/Base.Common/TcpConnector.cs
View File

@@ -241,7 +241,7 @@ namespace Modbus.Net
var stream = _socketClient.GetStream(); var stream = _socketClient.GetStream();
Log.Verbose("Tcp client {ConnectionToken} send text len = {Length}", ConnectionToken, datagram.Length); Log.Verbose("Tcp client {ConnectionToken} send text len = {Length}", ConnectionToken, datagram.Length);
Log.Verbose($"Tcp client {ConnectionToken} send text = {String.Concat(datagram.Select(p => " " + p))}"); Log.Verbose($"Tcp client {ConnectionToken} send text = {String.Concat(datagram.Select(p => " " + p.ToString("X2")))}");
await stream.WriteAsync(datagram, 0, datagram.Length); await stream.WriteAsync(datagram, 0, datagram.Length);
RefreshSendCount(); RefreshSendCount();
@@ -285,13 +285,13 @@ namespace Modbus.Net
RefreshSendCount(); RefreshSendCount();
Log.Verbose("Tcp client {ConnectionToken} send text len = {Length}", ConnectionToken, datagram.Length); Log.Verbose("Tcp client {ConnectionToken} send text len = {Length}", ConnectionToken, datagram.Length);
Log.Verbose($"Tcp client {ConnectionToken} send: {String.Concat(datagram.Select(p => " " + p))}"); Log.Verbose($"Tcp client {ConnectionToken} send: {String.Concat(datagram.Select(p => " " + p.ToString("X2")))}");
await stream.WriteAsync(datagram, 0, datagram.Length); await stream.WriteAsync(datagram, 0, datagram.Length);
var receiveBytes = await ReceiveAsync(stream); var receiveBytes = await ReceiveAsync(stream);
Log.Verbose("Tcp client {ConnectionToken} receive text len = {Length}", ConnectionToken, Log.Verbose("Tcp client {ConnectionToken} receive text len = {Length}", ConnectionToken,
receiveBytes.Length); receiveBytes.Length);
Log.Verbose($"Tcp client {ConnectionToken} receive: {String.Concat(receiveBytes.Select(p => " " + p))}"); Log.Verbose($"Tcp client {ConnectionToken} receive: {String.Concat(receiveBytes.Select(p => " " + p.ToString("X2")))}");
RefreshReceiveCount(); RefreshReceiveCount();