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

Fix

Browse Source
This commit is contained in:
parallelbgls
2017-02-14 14:32:13 +08:00
parent 49c1d8bedb
commit 65b4303830
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Modbus.Net/Modbus.Net.Modbus/ModbusProtocal.cs
View File

@@ -121,13 +121,6 @@ namespace Modbus.Net.Modbus
var dataCount = BigEndianValueHelper.Instance.GetByte(messageBytes, ref pos); var dataCount = BigEndianValueHelper.Instance.GetByte(messageBytes, ref pos);
var dataValue = new byte[dataCount]; var dataValue = new byte[dataCount];
Array.Copy(messageBytes, 3, dataValue, 0, dataCount); Array.Copy(messageBytes, 3, dataValue, 0, dataCount);
if (functionCode == 1 || functionCode == 2)
{
for (var i = 0; i < dataValue.Length; i++)
{
dataValue[i] = dataValue[i];
}
}
return new ReadDataModbusOutputStruct(slaveAddress, functionCode, dataCount, dataValue); return new ReadDataModbusOutputStruct(slaveAddress, functionCode, dataCount, dataValue);
} }
} }
@@ -193,15 +186,7 @@ namespace Modbus.Net.Modbus
public override byte[] Format(IInputStruct message) public override byte[] Format(IInputStruct message)
{ {
var r_message = (WriteDataModbusInputStruct) message; var r_message = (WriteDataModbusInputStruct) message;
var functionCode = r_message.FunctionCode;
var dataValue = Format(r_message.WriteValue); var dataValue = Format(r_message.WriteValue);
if (functionCode == 5 || functionCode == 15)
{
for (var i = 0; i < dataValue.Length; i++)
{
dataValue[i] = dataValue[i];
}
}
var formattingBytes = Format(r_message.SlaveAddress, r_message.FunctionCode, var formattingBytes = Format(r_message.SlaveAddress, r_message.FunctionCode,
r_message.StartAddress, r_message.WriteCount, r_message.WriteByteCount, dataValue); r_message.StartAddress, r_message.WriteCount, r_message.WriteByteCount, dataValue);
return formattingBytes; return formattingBytes;