Skip to content

Commit

Permalink
Add Cpu Info Add Single datatype
Browse files Browse the repository at this point in the history 
double (LReal) was incorrectly formed in previous versions, use float (Single Real) instead
  • Loading branch information
@ChrisPulman
ChrisPulman committed Aug 21, 2023
1 parent dfd2846 commit 54d4e6c
Show file tree
Hide file tree
Showing 23 changed files with 598 additions and 271 deletions.
Binary file added Docs/78028908_SIMATIC_Comm_DOKU_v23_e.pdf
View file
Binary file not shown.
Binary file added Docs/s71500_communication_function_manual_en-US_en-US.pdf
View file
Binary file not shown.
Binary file added Docs/t-bausteine_e.pdf
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Version.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
"version": "1.1.4",
"version": "1.2.0",
"publicReleaseRefSpec": [
"^refs/heads/master$",
"^refs/heads/main$"
Expand Down
15 changes: 11 additions & 4 deletions src/S7PlcRx.TestApp/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,21 @@
.AddUpdateTagItem<byte[]>(PlcData, "DB100.DBB0", 64).SetTagPollIng(false)
.AddUpdateTagItem<byte[]>(TestItems, "DB101.DBB0", 520).SetTagPollIng(false)
.AddUpdateTagItem<byte[]>(TagNames1, "DB102.DBB0", 4096).SetTagPollIng(false)
.AddUpdateTagItem<double[]>(TagValues, "DB103.DBD4", 98).SetTagPollIng(false);
.AddUpdateTagItem<float[]>(TagValues, "DB103.DBD4", 98).SetTagPollIng(false);

plc.IsConnected
.Where(x => x)
.Take(1)
.Subscribe(_ =>
.Subscribe(async _ =>
{
Console.WriteLine("Connected");
var info = await plc.GetCpuInfo();
foreach (var item in info)
{
Console.WriteLine(item);
}

await Task.Delay(2000);
plc.IsPaused.Subscribe(x => Console.WriteLine($"Paused: {x}"));
var setupComplete = false;
plc.Observe<byte>(StartLogging)
Expand Down Expand Up @@ -58,13 +65,13 @@
plc?.GetTag(TagValues).SetTagPollIng(true);
setupComplete = true;
});
plc.Observe<double[]>(TagValues)
plc.Observe<float[]>(TagValues)
.Where(_ => setupComplete)
.Subscribe(values =>
{
try
{
var tagValues = values?.Take(14).Select(Convert.ToSingle).ToArray();
var tagValues = values?.Take(14).ToArray();
Console.WriteLine($"TagValues: {string.Join(", ", tagValues!)}");
}
catch (Exception ex)
Expand Down
22 changes: 8 additions & 14 deletions src/S7PlcRx/Core/PLCRequest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,22 @@ namespace S7PlcRx.Core;
/// <summary>
/// PLC Request.
/// </summary>
internal class PLCRequest
/// <remarks>
/// Initializes a new instance of the <see cref="PLCRequest"/> class.
/// </remarks>
/// <param name="request">The request.</param>
/// <param name="tag">The tag.</param>
internal class PLCRequest(PLCRequestType request, Tag? tag)
{
/// <summary>
/// Initializes a new instance of the <see cref="PLCRequest"/> class.
/// </summary>
/// <param name="request">The request.</param>
/// <param name="tag">The tag.</param>
public PLCRequest(PLCRequestType request, Tag? tag)
{
Request = request;
Tag = tag;
}

/// <summary>
/// Gets the request.
/// </summary>
/// <value>The request.</value>
public PLCRequestType Request { get; }
public PLCRequestType Request { get; } = request;

/// <summary>
/// Gets the tag.
/// </summary>
/// <value>The tag.</value>
public Tag? Tag { get; }
public Tag? Tag { get; } = tag;
}
175 changes: 157 additions & 18 deletions src/S7PlcRx/Core/S7SocketRx.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ internal class S7SocketRx : IDisposable
private bool? _isAvailable;
private bool? _isConnected;
private Socket? _socket;
private ushort _dataReadLength = 480;

/// <summary>
/// Initializes a new instance of the <see cref="S7SocketRx" /> class.
Expand Down Expand Up @@ -81,7 +80,7 @@ public S7SocketRx(string ip, CpuType plcType, short rack, short slot)
obs.OnError(ex);
}));
dis.Add(IsAvailable.Subscribe(
_ =>
async _ =>
{
try
{
Expand All @@ -90,7 +89,7 @@ public S7SocketRx(string ip, CpuType plcType, short rack, short slot)
var isAvail = _isAvailable != null && _isAvailable.HasValue && _isAvailable.Value;
if (isAvail)
{
if (!_initComplete && !InitialiseSiemensConnection())
if (!_initComplete && !await InitialiseSiemensConnectionAsync())
{
CloseSocket(_socket);
obs.OnError(new S7Exception("Device not connected"));
Expand Down Expand Up @@ -139,7 +138,7 @@ public S7SocketRx(string ip, CpuType plcType, short rack, short slot)
/// <value>
/// The length of the data read.
/// </value>
public int DataReadLength => _dataReadLength;
public ushort DataReadLength { get; private set; } = 480;

/// <summary>
/// Gets the is available.
Expand Down Expand Up @@ -251,16 +250,19 @@ public void Dispose()
/// <param name="tag">The tag.</param>
/// <param name="buffer">The buffer.</param>
/// <param name="size">The size.</param>
/// <returns>A int.</returns>
public int Receive(Tag tag, byte[] buffer, int size)
/// <param name="offset">The offset.</param>
/// <returns>
/// A int.
/// </returns>
public int Receive(Tag tag, byte[] buffer, int size, int offset = 0)
{
if (_initComplete)
{
try
{
if (_socket?.Connected == true)
{
var r = _socket?.Receive(buffer, size, SocketFlags.None);
var r = _socket?.Receive(buffer, offset, size, SocketFlags.None);
if (tag != null && Debugger.IsAttached)
{
var res = buffer[21] == 255 ? Success : Failed;
Expand Down Expand Up @@ -317,6 +319,135 @@ public int Send(Tag tag, byte[] buffer, int size)
return -1;
}

internal (byte[] data, ushort size) GetSZLData(ushort szlArea, ushort index = 0)
{
//// 0, 1, 2, 3 , 4, 5, 6, 7, 8, 9, 10,11,12,13,14,15,16,17,18,19, 20,21, 22, 23,24,25, 26,27,28,29,30,31,32
byte[] s7_SZL1 = { 3, 0, 0, 33, 2, 240, 128, 50, 7, 0, 0, 5, 0, 0, 8, 0, 8, 0, 1, 18, 4, 17, 68, 1, 0, 255, 9, 0, 4, 0, 0, 0, 0 };
byte[] s7_SZL2 = { 3, 0, 0, 33, 2, 240, 128, 50, 7, 0, 0, 6, 0, 0, 12, 0, 4, 0, 1, 18, 8, 18, 68, 1, 1, 0, 0, 0, 0, 10, 0, 0, 0 };
const int size = 1024;
var data = new byte[size];
var resultData = new byte[size];
var tag = new Tag();
int length;
var done = false;
var first = true;
byte seq_in = 0;
ushort seq_out = 0;
var lastError = 0;
var offset = 0;
ushort lengthOfDataRead = 0;
int szlDataLength;

do
{
if (first)
{
Word.ToByteArray(++seq_out, s7_SZL1, 11);
Word.ToByteArray(szlArea, s7_SZL1, 29);
Word.ToByteArray(index, s7_SZL1, 31);
Send(tag, s7_SZL1, s7_SZL1.Length);
}
else
{
Word.ToByteArray(++seq_out, s7_SZL2, 11);
s7_SZL2[24] = seq_in;
Send(tag, s7_SZL2, s7_SZL2.Length);
}

if (lastError != 0)
{
return (Array.Empty<byte>(), 0);
}

length = ReceiveIsoData(tag, ref data);

if (lastError == 0 && length > 32)
{
if (first && (Word.FromByteArray(data, 27) == 0) && (data[29] == 255))
{
szlDataLength = Word.FromByteArray(data, 31) - 8;
done = data[26] == 0;
seq_in = data[24];
lengthOfDataRead = Word.FromByteArray(data, 37);
Array.Copy(data, 41, resultData, offset, szlDataLength);
offset += szlDataLength;
lengthOfDataRead += lengthOfDataRead;
first = false;
}
else if ((Word.FromByteArray(data, 27) == 0) && (data[29] == 255))
{
szlDataLength = Word.FromByteArray(data, 31);
done = data[26] == 0;
seq_in = data[24];
Array.Copy(data, 37, resultData, offset, szlDataLength);
offset += szlDataLength;
lengthOfDataRead += lengthOfDataRead;
}
else
{
lastError = (int)ErrorCode.WrongVarFormat;
}
}
else
{
lastError = (int)ErrorCode.WrongNumberReceivedBytes;
}
}
while (!done && (lastError == 0));

if (lastError == 0)
{
var result = new byte[length];
Array.Copy(resultData, result, length);
return (result, lengthOfDataRead);
}

return (Array.Empty<byte>(), 0);
}

internal int ReceiveIsoData(Tag tag, ref byte[] bytes)
{
var done = false;
var size = 0;
var lastError = 0;
//// byte lastPDUType;
while ((lastError == 0) && !done)
{
Receive(tag, bytes, 4);
if (lastError == 0)
{
size = Word.FromByteArray(bytes, 2);

if (size == 7)
{
Receive(tag, bytes, 3, 4);
}
else if ((size > DataReadLength + 7) || (size < 16))
{
lastError = (int)ErrorCode.WrongNumberReceivedBytes;
}
else
{
done = true;
}
}
}

switch (lastError)
{
case 0:
// Get PDU Type, incase we need it
Receive(tag, bytes, 3, 4);
//// lastPDUType = bytes[5];

// Receives the S7 ISO Payload
Receive(tag, bytes, size - 7, 7);
return size;
default:
return 0;
}
}

/// <summary>
/// Releases unmanaged and - optionally - managed resources.
/// </summary>
Expand Down Expand Up @@ -349,7 +480,7 @@ private static void CloseSocket(Socket? socket)
}
}

private bool InitialiseSiemensConnection()
private async Task<bool> InitialiseSiemensConnectionAsync()
{
var bReceive = new byte[256];
try
Expand All @@ -359,10 +490,10 @@ private bool InitialiseSiemensConnection()
return false;
}

_socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReceiveTimeout, 1000);
_socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.SendTimeout, 1000);
_socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReceiveTimeout, 10000);
_socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.SendTimeout, 10000);
var server = new IPEndPoint(IPAddress.Parse(IP), 102);
_socket.Connect(server);
await _socket.ConnectAsync(server);
_isConnected = _socket.Connected || (_socket.Poll(1000, SelectMode.SelectRead) && _socket.Available == 0);
if (_isConnected == false)
{
Expand All @@ -374,12 +505,20 @@ private bool InitialiseSiemensConnection()

switch (PLCType)
{
case CpuType.Logo0BA8:
bSend1[13] = 1;
bSend1[14] = 0;
bSend1[17] = 1;
bSend1[18] = 2;
DataReadLength = 240;
break;

case CpuType.S7200:
bSend1[13] = 16;
bSend1[14] = 0;
bSend1[17] = 16;
bSend1[18] = 0;
_dataReadLength = 480;
DataReadLength = 480;
break;

case CpuType.S71200:
Expand All @@ -389,15 +528,15 @@ private bool InitialiseSiemensConnection()
bSend1[14] = 0;
bSend1[17] = 3;
bSend1[18] = (byte)((Rack * 2 * 16) + Slot);
_dataReadLength = 480;
DataReadLength = 480;
break;

case CpuType.S71500:
bSend1[13] = 16;
bSend1[14] = 2;
bSend1[17] = 3;
bSend1[18] = (byte)((Rack * 2 * 16) + Slot);
_dataReadLength = 960;
DataReadLength = 960;
break;

default:
Expand All @@ -412,11 +551,11 @@ private bool InitialiseSiemensConnection()
throw new S7Exception(nameof(ErrorCode.WrongNumberReceivedBytes));
}

// (4,5,6) TPKT + COTP
// (23,24) PDU Length Requested = HI-LO Here Default 480 bytes
//// //1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25//
//// 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25//
byte[] bsend2 = { 3, 0, 0, 25, 2, 240, 128, 50, 1, 0, 0, 4, 0, 0, 8, 0, 0, 240, 0, 0, 1, 0, 1, 0, 30 };
Array.Copy(Word.ToByteArray(_dataReadLength), 0, bsend2, 23, 2);

// (23,24) PDU Length Requested = HI-LO Here Default 480 bytes
Word.ToByteArray(DataReadLength, bsend2, 23);
_socket.Send(bsend2, 25, SocketFlags.None);

result = _socket.Receive(bReceive, 27, SocketFlags.None);
Expand Down
5 changes: 5 additions & 0 deletions src/S7PlcRx/Enums/CpuType.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ namespace S7PlcRx.Enums;
/// </summary>
public enum CpuType
{
/// <summary>
/// The logo0ba8.
/// </summary>
Logo0BA8,

/// <summary>
/// The S7200.
/// </summary>
Expand Down
5 changes: 5 additions & 0 deletions src/S7PlcRx/Enums/VarType.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ internal enum VarType
/// </summary>
Real,

/// <summary>
/// The l real.
/// </summary>
LReal,

/// <summary>
/// The string.
/// </summary>
Expand Down
4 changes: 2 additions & 2 deletions src/S7PlcRx/PlcTypes/Class.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public static void FromBytes(object? sourceClass, Type classType, byte[] bytes)
}

// hier auswerten
property.SetValue(sourceClass, Real.FromByteArray(new byte[] { bytes[(int)numBytes], bytes[(int)numBytes + 1], bytes[(int)numBytes + 2], bytes[(int)numBytes + 3] }), null);
property.SetValue(sourceClass, LReal.FromByteArray(new byte[] { bytes[(int)numBytes], bytes[(int)numBytes + 1], bytes[(int)numBytes + 2], bytes[(int)numBytes + 3] }), null);
numBytes += 4;
break;

Expand Down Expand Up @@ -268,7 +268,7 @@ public static byte[] ToBytes(object sourceClass)
break;

case "Single":
bytes2 = Real.ToByteArray((float)property.GetValue(sourceClass, null)!);
bytes2 = LReal.ToByteArray((float)property.GetValue(sourceClass, null)!);
break;
}

Expand Down
Loading

0 comments on commit 54d4e6c

Please sign in to comment.