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:
luosheng
2023-12-12 10:17:58 +08:00
parent c6b5d9b928
commit 258da627ac
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Modbus.Net/Modbus.Net.BigEndian3412/Modbus.Net.BigEndian3412ValueHelper.cs
View File

@@ -166,35 +166,30 @@ namespace Modbus.Net
public override int GetInt(byte[] data, ref int pos) public override int GetInt(byte[] data, ref int pos)
{ {
Array.Reverse(data, pos, 4);
byte temp; byte temp;
temp = data[pos]; data[pos] = data[pos + 2]; data[pos + 2] = temp; temp = data[pos]; data[pos] = data[pos + 2]; data[pos + 2] = temp;
temp = data[pos + 1]; data[pos + 1] = data[pos + 3]; data[pos + 3] = temp; temp = data[pos + 1]; data[pos + 1] = data[pos + 3]; data[pos + 3] = temp;
var t = BitConverter.ToInt32(data, pos); var t = BitConverter.ToInt32(data, pos);
temp = data[pos]; data[pos] = data[pos + 2]; data[pos + 2] = temp; temp = data[pos]; data[pos] = data[pos + 2]; data[pos + 2] = temp;
temp = data[pos + 1]; data[pos + 1] = data[pos + 3]; data[pos + 3] = temp; temp = data[pos + 1]; data[pos + 1] = data[pos + 3]; data[pos + 3] = temp;
Array.Reverse(data, pos, 4);
pos += 4; pos += 4;
return t; return t;
} }
public override uint GetUInt(byte[] data, ref int pos) public override uint GetUInt(byte[] data, ref int pos)
{ {
Array.Reverse(data, pos, 4);
byte temp; byte temp;
temp = data[pos]; data[pos] = data[pos + 2]; data[pos + 2] = temp; temp = data[pos]; data[pos] = data[pos + 2]; data[pos + 2] = temp;
temp = data[pos + 1]; data[pos + 1] = data[pos + 3]; data[pos + 3] = temp; temp = data[pos + 1]; data[pos + 1] = data[pos + 3]; data[pos + 3] = temp;
var t = BitConverter.ToUInt32(data, pos); var t = BitConverter.ToUInt32(data, pos);
temp = data[pos]; data[pos] = data[pos + 2]; data[pos + 2] = temp; temp = data[pos]; data[pos] = data[pos + 2]; data[pos + 2] = temp;
temp = data[pos + 1]; data[pos + 1] = data[pos + 3]; data[pos + 3] = temp; temp = data[pos + 1]; data[pos + 1] = data[pos + 3]; data[pos + 3] = temp;
Array.Reverse(data, pos, 4);
pos += 4; pos += 4;
return t; return t;
} }
public override long GetLong(byte[] data, ref int pos) public override long GetLong(byte[] data, ref int pos)
{ {
Array.Reverse(data, pos, 8);
byte temp; byte temp;
temp = data[pos]; data[pos] = data[pos + 6]; data[pos + 6] = temp; temp = data[pos]; data[pos] = data[pos + 6]; data[pos + 6] = temp;
temp = data[pos + 1]; data[pos + 1] = data[pos + 7]; data[pos + 7] = temp; temp = data[pos + 1]; data[pos + 1] = data[pos + 7]; data[pos + 7] = temp;
@@ -205,14 +200,12 @@ namespace Modbus.Net
temp = data[pos + 1]; data[pos + 1] = data[pos + 7]; data[pos + 7] = temp; temp = data[pos + 1]; data[pos + 1] = data[pos + 7]; data[pos + 7] = temp;
temp = data[pos + 2]; data[pos + 2] = data[pos + 4]; data[pos + 4] = temp; temp = data[pos + 2]; data[pos + 2] = data[pos + 4]; data[pos + 4] = temp;
temp = data[pos + 3]; data[pos + 3] = data[pos + 5]; data[pos + 5] = temp; temp = data[pos + 3]; data[pos + 3] = data[pos + 5]; data[pos + 5] = temp;
Array.Reverse(data, pos, 8);
pos += 8; pos += 8;
return t; return t;
} }
public override ulong GetULong(byte[] data, ref int pos) public override ulong GetULong(byte[] data, ref int pos)
{ {
Array.Reverse(data, pos, 8);
byte temp; byte temp;
temp = data[pos]; data[pos] = data[pos + 6]; data[pos + 6] = temp; temp = data[pos]; data[pos] = data[pos + 6]; data[pos + 6] = temp;
temp = data[pos + 1]; data[pos + 1] = data[pos + 7]; data[pos + 7] = temp; temp = data[pos + 1]; data[pos + 1] = data[pos + 7]; data[pos + 7] = temp;
@@ -223,28 +216,24 @@ namespace Modbus.Net
temp = data[pos + 1]; data[pos + 1] = data[pos + 7]; data[pos + 7] = temp; temp = data[pos + 1]; data[pos + 1] = data[pos + 7]; data[pos + 7] = temp;
temp = data[pos + 2]; data[pos + 2] = data[pos + 4]; data[pos + 4] = temp; temp = data[pos + 2]; data[pos + 2] = data[pos + 4]; data[pos + 4] = temp;
temp = data[pos + 3]; data[pos + 3] = data[pos + 5]; data[pos + 5] = temp; temp = data[pos + 3]; data[pos + 3] = data[pos + 5]; data[pos + 5] = temp;
Array.Reverse(data, pos, 8);
pos += 8; pos += 8;
return t; return t;
} }
public override float GetFloat(byte[] data, ref int pos) public override float GetFloat(byte[] data, ref int pos)
{ {
Array.Reverse(data, pos, 4);
byte temp; byte temp;
temp = data[pos]; data[pos] = data[pos + 2]; data[pos + 2] = temp; temp = data[pos]; data[pos] = data[pos + 2]; data[pos + 2] = temp;
temp = data[pos + 1]; data[pos + 1] = data[pos + 3]; data[pos + 3] = temp; temp = data[pos + 1]; data[pos + 1] = data[pos + 3]; data[pos + 3] = temp;
var t = BitConverter.ToSingle(data, pos); var t = BitConverter.ToSingle(data, pos);
temp = data[pos]; data[pos] = data[pos + 2]; data[pos + 2] = temp; temp = data[pos]; data[pos] = data[pos + 2]; data[pos + 2] = temp;
temp = data[pos + 1]; data[pos + 1] = data[pos + 3]; data[pos + 3] = temp; temp = data[pos + 1]; data[pos + 1] = data[pos + 3]; data[pos + 3] = temp;
Array.Reverse(data, pos, 4);
pos += 4; pos += 4;
return t; return t;
} }
public override double GetDouble(byte[] data, ref int pos) public override double GetDouble(byte[] data, ref int pos)
{ {
Array.Reverse(data, pos, 8);
byte temp; byte temp;
temp = data[pos]; data[pos] = data[pos + 6]; data[pos + 6] = temp; temp = data[pos]; data[pos] = data[pos + 6]; data[pos + 6] = temp;
temp = data[pos + 1]; data[pos + 1] = data[pos + 7]; data[pos + 7] = temp; temp = data[pos + 1]; data[pos + 1] = data[pos + 7]; data[pos + 7] = temp;
@@ -255,7 +244,6 @@ namespace Modbus.Net
temp = data[pos + 1]; data[pos + 1] = data[pos + 7]; data[pos + 7] = temp; temp = data[pos + 1]; data[pos + 1] = data[pos + 7]; data[pos + 7] = temp;
temp = data[pos + 2]; data[pos + 2] = data[pos + 4]; data[pos + 4] = temp; temp = data[pos + 2]; data[pos + 2] = data[pos + 4]; data[pos + 4] = temp;
temp = data[pos + 3]; data[pos + 3] = data[pos + 5]; data[pos + 5] = temp; temp = data[pos + 3]; data[pos + 3] = data[pos + 5]; data[pos + 5] = temp;
Array.Reverse(data, pos, 8);
pos += 8; pos += 8;
return t; return t;
} }