Learning/s7netplus
0
0
Fork 0
mirror of https://github.com/S7NetPlus/s7netplus.git synced 2026-02-17 14:28:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Dtl: Add TypeLengthInBytes constant instead of always rewriting 12.

Browse Source
This commit is contained in:
Serge Camille
2020-08-17 19:20:19 +02:00
parent a1d87de2d9
commit 28257f28b3
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
S7.Net/Types/DateTimeLong.cs
View File

@@ -9,6 +9,7 @@ namespace S7.Net.Types
/// </summary> /// </summary>
public static class DateTimeLong public static class DateTimeLong
{ {
public const int TypeLengthInBytes = 12;
/// <summary> /// <summary>
/// The minimum <see cref="T:System.DateTime" /> value supported by the specification. /// The minimum <see cref="T:System.DateTime" /> value supported by the specification.
/// </summary> /// </summary>
@@ -46,19 +47,19 @@ namespace S7.Net.Types
/// </exception> /// </exception>
public static System.DateTime[] ToArray(byte[] bytes) public static System.DateTime[] ToArray(byte[] bytes)
{ {
if (bytes.Length % 12 != 0) if (bytes.Length % TypeLengthInBytes != 0)
{ {
throw new ArgumentOutOfRangeException(nameof(bytes), bytes.Length, throw new ArgumentOutOfRangeException(nameof(bytes), bytes.Length,
$"Parsing an array of DateTimeLong requires a multiple of 12 bytes of input data, input data is '{bytes.Length}' long."); $"Parsing an array of DateTimeLong requires a multiple of 12 bytes of input data, input data is '{bytes.Length}' long.");
} }
var cnt = bytes.Length / 12; var cnt = bytes.Length / TypeLengthInBytes;
var result = new System.DateTime[cnt]; var result = new System.DateTime[cnt];
for (var i = 0; i < cnt; i++) for (var i = 0; i < cnt; i++)
{ {
var slice = new byte[12]; var slice = new byte[TypeLengthInBytes];
Array.Copy(bytes, i * 12, slice, 0, 12); Array.Copy(bytes, i * TypeLengthInBytes, slice, 0, TypeLengthInBytes);
result[i] = FromByteArrayImpl(slice); result[i] = FromByteArrayImpl(slice);
} }
@@ -67,7 +68,7 @@ namespace S7.Net.Types
private static System.DateTime FromByteArrayImpl(byte[] bytes) private static System.DateTime FromByteArrayImpl(byte[] bytes)
{ {
if (bytes.Length != 12) if (bytes.Length != TypeLengthInBytes)
{ {
throw new ArgumentOutOfRangeException(nameof(bytes), bytes.Length, throw new ArgumentOutOfRangeException(nameof(bytes), bytes.Length,
$"Parsing a DateTimeLong requires exactly 12 bytes of input data, input data is {bytes.Length} bytes long."); $"Parsing a DateTimeLong requires exactly 12 bytes of input data, input data is {bytes.Length} bytes long.");
@@ -114,7 +115,7 @@ namespace S7.Net.Types
$"Date time '{dateTime}' is after the maximum '{SpecMaximumDateTime}' supported in S7 DateTimeLong representation."); $"Date time '{dateTime}' is after the maximum '{SpecMaximumDateTime}' supported in S7 DateTimeLong representation.");
} }
var stream = new MemoryStream(12); var stream = new MemoryStream(TypeLengthInBytes);
// Convert Year // Convert Year
stream.Write(Word.ToByteArray(Convert.ToUInt16(dateTime.Year)), 0, 2); stream.Write(Word.ToByteArray(Convert.ToUInt16(dateTime.Year)), 0, 2);
@@ -155,7 +156,7 @@ namespace S7.Net.Types
/// </exception> /// </exception>
public static byte[] ToByteArray(System.DateTime[] dateTimes) public static byte[] ToByteArray(System.DateTime[] dateTimes)
{ {
var bytes = new List<byte>(dateTimes.Length * 12); var bytes = new List<byte>(dateTimes.Length * TypeLengthInBytes);
foreach (var dateTime in dateTimes) foreach (var dateTime in dateTimes)
{ {
bytes.AddRange(ToByteArray(dateTime)); bytes.AddRange(ToByteArray(dateTime));