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

Modbus ASCII and Siemens PPI support (not test), ComConnector Remaintainence.

Browse Source
This commit is contained in:
罗圣
2016-09-01 10:45:47 +08:00
parent f8c1b83656
commit 9d07328625
20 changed files with 587 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,9 +124,10 @@ namespace Modbus.Net.Modbus
var translateAddress = addressTranslator.AddressTranslate(startAddress, false);
FunctionCode = (byte)translateAddress.Area;
StartAddress = (ushort)translateAddress.Address;
WriteCount = (ushort)Math.Ceiling(writeValue.Length / 2.0);
WriteByteCount = 0;
WriteValue = writeValue;
var writeByteValue = BigEndianValueHelper.Instance.ObjectArrayToByteArray(writeValue);
WriteCount = (ushort)(writeByteValue.Length / 2);
WriteByteCount = (byte)writeByteValue.Length;
WriteValue = writeByteValue;
}
public byte BelongAddress { get; private set; }
@@ -139,7 +140,7 @@ namespace Modbus.Net.Modbus
public byte WriteByteCount { get; private set; }
public object[] WriteValue { get; private set; }
public byte[] WriteValue { get; private set; }
}
public class WriteDataModbusOutputStruct : OutputStruct
@@ -172,7 +173,6 @@ namespace Modbus.Net.Modbus
var r_message = (WriteDataModbusInputStruct)message;
byte[] formattingBytes = Format(r_message.BelongAddress, r_message.FunctionCode,
r_message.StartAddress, r_message.WriteCount, r_message.WriteByteCount, r_message.WriteValue);
formattingBytes[6] = (byte)(formattingBytes.Length - 7);
return formattingBytes;
}