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

Merge pull request #45 from watashimeandeu/master

Browse Source 
Read structs recursively
This commit is contained in:
Michele Cattafesta
2016-03-09 23:39:52 +01:00
parent ba56e31747 5dcd52e9d2
commit c5dca71560
3 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
S7.Net.Common/Types/Struct.cs
View File

@@ -49,6 +49,9 @@ namespace S7.Net.Types
numBytes++;
numBytes += 4;
break;
default:
numBytes += GetStructSize(info.FieldType);
break;
}
}
return (int)numBytes;
@@ -146,6 +149,14 @@ namespace S7.Net.Types
bytes[(int)numBytes + 3] }));
numBytes += 4;
break;
default:
var buffer = new byte[GetStructSize(info.FieldType)];
if (buffer.Length == 0)
continue;
Buffer.BlockCopy(bytes, (int)Math.Ceiling(numBytes), buffer, 0, buffer.Length);
info.SetValue(structValue, FromBytes(info.FieldType, buffer));
numBytes += buffer.Length;
break;
}
}
return structValue;

14
S7.Net.Core/PLC.cs
View File

@@ -803,9 +803,14 @@ namespace S7.Net
}
public ErrorCode WriteStruct(object structValue, int db)
{
return WriteStruct(structValue, db, 0);
}
public ErrorCode WriteStruct(object structValue, int db, int startByteAdr)
{
var bytes = Types.Struct.ToBytes(structValue).ToList();
var errCode = WriteMultipleBytes(bytes, db);
var errCode = WriteMultipleBytes(bytes, db, startByteAdr);
return errCode;
}
@@ -823,9 +828,14 @@ namespace S7.Net
/// <param name="db">The DB number</param>
/// <returns>ErrorCode when writing (NoError if everything was ok)</returns>
private ErrorCode WriteMultipleBytes(List<byte> bytes, int db)
{
return WriteMultipleBytes(bytes, db, 0);
}
private ErrorCode WriteMultipleBytes(List<byte> bytes, int db, int startByteAdr)
{
ErrorCode errCode = ErrorCode.NoError;
int index = 0;
int index = startByteAdr;
try
{
while (bytes.Count > 0)

14
S7.Net/PLC.cs
View File

@@ -803,9 +803,14 @@ namespace S7.Net
}
public ErrorCode WriteStruct(object structValue, int db)
{
return WriteStruct(structValue, db, 0);
}
public ErrorCode WriteStruct(object structValue, int db, int startByteAdr)
{
var bytes = Types.Struct.ToBytes(structValue).ToList();
var errCode = WriteMultipleBytes(bytes, db);
var errCode = WriteMultipleBytes(bytes, db, startByteAdr);
return errCode;
}
@@ -823,9 +828,14 @@ namespace S7.Net
/// <param name="db">The DB number</param>
/// <returns>ErrorCode when writing (NoError if everything was ok)</returns>
private ErrorCode WriteMultipleBytes(List<byte> bytes, int db)
{
return WriteMultipleBytes(bytes, db, 0);
}
private ErrorCode WriteMultipleBytes(List<byte> bytes, int db, int startByteAdr)
{
ErrorCode errCode = ErrorCode.NoError;
int index = 0;
int index = startByteAdr;
try
{
while (bytes.Count > 0)