From 4364f246f0a51d8d827d2ea71fc425b6ccbeb86e Mon Sep 17 00:00:00 2001 From: parallelbgls Date: Tue, 15 Aug 2017 14:26:57 +0800 Subject: [PATCH] Change Log to Hex. --- Modbus.Net/Modbus.Net/ComConnector.cs | 6 +++--- Modbus.Net/src/Base.Common/TcpConnector.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Modbus.Net/Modbus.Net/ComConnector.cs b/Modbus.Net/Modbus.Net/ComConnector.cs index 0c5b417..5005498 100644 --- a/Modbus.Net/Modbus.Net/ComConnector.cs +++ b/Modbus.Net/Modbus.Net/ComConnector.cs @@ -459,7 +459,7 @@ namespace Modbus.Net Log.Verbose("Com client {ConnectionToken} send msg length: {Length}", ConnectionToken, sendbytes.Length); 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); } catch (Exception err) @@ -475,7 +475,7 @@ namespace Modbus.Net Log.Verbose("Com client {ConnectionToken} receive msg length: {Length}", ConnectionToken, returnBytes.Length); 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) { @@ -531,7 +531,7 @@ namespace Modbus.Net Log.Verbose("Com client {ConnectionToken} send msg length: {Length}", ConnectionToken, sendbytes.Length); 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); } catch (Exception err) diff --git a/Modbus.Net/src/Base.Common/TcpConnector.cs b/Modbus.Net/src/Base.Common/TcpConnector.cs index a73c96f..28da173 100644 --- a/Modbus.Net/src/Base.Common/TcpConnector.cs +++ b/Modbus.Net/src/Base.Common/TcpConnector.cs @@ -241,7 +241,7 @@ namespace Modbus.Net var stream = _socketClient.GetStream(); 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); RefreshSendCount(); @@ -285,13 +285,13 @@ namespace Modbus.Net RefreshSendCount(); 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); var receiveBytes = await ReceiveAsync(stream); Log.Verbose("Tcp client {ConnectionToken} receive text len = {Length}", ConnectionToken, 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();