Skip to content

Fix ReadClass for UInt32 #415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mycroes merged 3 commits into from
Dec 10, 2022
Merged

Fix ReadClass for UInt32 #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8df1a9c
Add unit test for ReadClass uint32 bug.
scamille Oct 4, 2021
12281ec
Fix ReadClass for Uint32
scamille Oct 4, 2021
868e719
Merge remote-tracking branch 's7netplus/develop' into fb-fixClassUint32
mycroes Dec 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions S7.Net.UnitTest/TypeTests/ClassTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,19 @@ public void GetClassSizeTest()
Assert.AreEqual(Class.GetClassSize(new TestClassUnevenSize(3, 17)), 10);
}

/// <summary>
/// Ensure Uint32 is correctly parsed through ReadClass functions. Adresses issue https://github.com/S7NetPlus/s7netplus/issues/414
/// </summary>
[TestMethod]
public void TestUint32Read()
{
var result = new TestUint32();
var data = new byte[4] { 0, 0, 0, 5 };
var bytesRead = Class.FromBytes(result, data);
Assert.AreEqual(bytesRead, data.Length);
Assert.AreEqual(5u, result.Value1);
}

private class TestClassUnevenSize
{
public bool Bool { get; set; }
Expand All @@ -29,5 +42,10 @@ public TestClassUnevenSize(int byteCount, int bitCount)
Bools = new bool[bitCount];
}
}

private class TestUint32
{
public uint Value1 { get; set; }
}
}
}
17 changes: 6 additions & 11 deletions S7.Net/Types/Class.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,22 +148,17 @@ public static double GetClassSize(object instance, double numBytes = 0.0, bool i
break;
case "Int32":
IncrementToEven(ref numBytes);
// hier auswerten
uint sourceUInt = DWord.FromBytes(bytes[(int)numBytes + 3],
bytes[(int)numBytes + 2],
bytes[(int)numBytes + 1],
bytes[(int)numBytes + 0]);
var wordBuffer = new byte[4];
Array.Copy(bytes, (int)numBytes, wordBuffer, 0, wordBuffer.Length);
uint sourceUInt = DWord.FromByteArray(wordBuffer);
value = sourceUInt.ConvertToInt();
numBytes += 4;
break;
case "UInt32":
IncrementToEven(ref numBytes);
// hier auswerten
value = DWord.FromBytes(
bytes[(int)numBytes],
bytes[(int)numBytes + 1],
bytes[(int)numBytes + 2],
bytes[(int)numBytes + 3]);
var wordBuffer2 = new byte[4];
Array.Copy(bytes, (int)numBytes, wordBuffer2, 0, wordBuffer2.Length);
value = DWord.FromByteArray(wordBuffer2);
numBytes += 4;
break;
case "Single":
Expand Down