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

2017-02-27 update 1 Remove redundant code.

Browse Source
This commit is contained in:
parallelbgls
2017-02-27 17:25:45 +08:00
parent 18e4f6ce80
commit fa19a92cd0
2 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Modbus.Net/Modbus.Net/BaseProtocal.cs
View File

@@ -73,21 +73,19 @@ namespace Modbus.Net
/// <summary> /// <summary>
/// 发送协议内容并接收，一般方法 /// 发送协议内容并接收，一般方法
/// </summary> /// </summary>
/// <param name="isLittleEndian">是否是小端格式</param>
/// <param name="content">写入的内容，使用对象数组描述</param> /// <param name="content">写入的内容，使用对象数组描述</param>
/// <returns>从设备获取的字节流</returns> /// <returns>从设备获取的字节流</returns>
public virtual byte[] SendReceive(Endian isLittleEndian, params object[] content) public virtual byte[] SendReceive(params object[] content)
{ {
return AsyncHelper.RunSync(() => SendReceiveAsync(isLittleEndian, content)); return AsyncHelper.RunSync(() => SendReceiveAsync(Endian, content));
} }
/// <summary> /// <summary>
/// 发送协议内容并接收，一般方法 /// 发送协议内容并接收，一般方法
/// </summary> /// </summary>
/// <param name="isLittleEndian">是否是小端格式</param>
/// <param name="content">写入的内容，使用对象数组描述</param> /// <param name="content">写入的内容，使用对象数组描述</param>
/// <returns>从设备获取的字节流</returns> /// <returns>从设备获取的字节流</returns>
public virtual async Task<byte[]> SendReceiveAsync(Endian isLittleEndian, params object[] content) public virtual async Task<byte[]> SendReceiveAsync(params object[] content)
{ {
if (ProtocalLinker == null || !ProtocalLinker.IsConnected) if (ProtocalLinker == null || !ProtocalLinker.IsConnected)
{ {
@@ -95,7 +93,7 @@ namespace Modbus.Net
} }
if (ProtocalLinker != null) if (ProtocalLinker != null)
{ {
return await ProtocalLinker.SendReceiveAsync(ProtocalUnit.TranslateContent(isLittleEndian, content)); return await ProtocalLinker.SendReceiveAsync(ProtocalUnit.TranslateContent(Endian, content));
} }
return null; return null;
} }

23
Modbus.Net/Modbus.Net/ProtocalUnit.cs
View File

@@ -40,27 +40,12 @@ namespace Modbus.Net
/// <summary> /// <summary>
/// 转换静态方法，把对象数组转换为字节数组。 /// 转换静态方法，把对象数组转换为字节数组。
/// </summary> /// </summary>
/// <param name="isLittleEndian">是否是小端格式</param> /// <param name="endian">是否是小端格式</param>
/// <param name="contents">对象数组</param> /// <param name="contents">对象数组</param>
/// <returns>字节数组</returns> /// <returns>字节数组</returns>
public static byte[] TranslateContent(Endian isLittleEndian, params object[] contents) public static byte[] TranslateContent(Endian endian, params object[] contents)
{ {
switch (isLittleEndian) return ValueHelper.GetInstance(endian).ObjectArrayToByteArray(contents);
{
case Endian.LittleEndianLsb:
{
return ValueHelper.Instance.ObjectArrayToByteArray(contents);
}
case Endian.BigEndianLsb:
{
return BigEndianValueHelper.Instance.ObjectArrayToByteArray(contents);
}
case Endian.BigEndianMsb:
{
return BigEndianMsbValueHelper.Instance.ObjectArrayToByteArray(contents);
}
}
return null;
} }
} }