Merge pull request #30 from ChrisPulman/AddCpuInfoAddSingle

ChrisPulman · Aug 21, 2023 · 6f334cd · 6f334cd
2 parents dfd2846 + 3cce938
commit 6f334cd
Show file tree

Hide file tree

Showing 25 changed files with 633 additions and 273 deletions.
diff --git a/Docs/78028908_SIMATIC_Comm_DOKU_v23_e.pdf b/Docs/78028908_SIMATIC_Comm_DOKU_v23_e.pdf
diff --git a/Docs/s71500_communication_function_manual_en-US_en-US.pdf b/Docs/s71500_communication_function_manual_en-US_en-US.pdf
diff --git a/Docs/t-bausteine_e.pdf b/Docs/t-bausteine_e.pdf
diff --git a/README.md b/README.md
@@ -1,8 +1,10 @@
 ![License](https://img.shields.io/github/license/ChrisPulman/S7PlcRx.svg) [![Build](https://github.com/ChrisPulman/S7PlcRx/actions/workflows/BuildOnly.yml/badge.svg)](https://github.com/ChrisPulman/S7PlcRx/actions/workflows/BuildOnly.yml) ![Nuget](https://img.shields.io/nuget/dt/S7PlcRx?color=pink&style=plastic) [![NuGet](https://img.shields.io/nuget/v/S7PlcRx.svg?style=plastic)](https://www.nuget.org/packages/S7PlcRx)
 
+![Alt](https://repobeats.axiom.co/api/embed/48a23aed3690ef69ed277b96f2154062dd436af2.svg "Repobeats analytics image")
+
 <p align="left">
   <a href="https://github.com/ChrisPulman/S7PlcRx">
-    <img alt="S7PlcRx" src="https://github.com/ChrisPulman/S7PlcRx/blob/main/Images/S7PlcRx.png" width="200"/>
+    <img alt="S7PlcRx" src="./Images/S7PlcRx.png" width="200"/>
   </a>
 </p>
 
@@ -64,3 +66,34 @@ plc?.GetTag("Tag0")?.SetTagPollIng(true);
 ```csharp
 plc.Value<double>("Tag0", 1.0);
 ```
+
+#### Read PLC CPU Info
+```csharp
+var cpuInfo = await plc.CpuInfo();
+```
+
+This returns a `CpuInfo` string Array with the following values:
+AS Name, Module Name, Copyright, Serial Number, Module Type Name, Order Code, Version.
+
+#### Supported Data Types
+
+- Bool
+- Byte
+- Int
+- DInt
+- Real
+- LReal
+- String
+- Word
+- DWord
+
+Further types will be added in the future.
+
+#### Supported PLCs
+
+- Logo-0BA8
+- S7-200
+- S7-300
+- S7-400
+- S7-1200
+- S7-1500
diff --git a/Version.json b/Version.json
@@ -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$"

diff --git a/build/Build.cs b/build/Build.cs
@@ -56,7 +56,7 @@ partial class Build : NukeBuild
             }
 
             PackagesDirectory.CreateOrCleanDirectory();
-            await this.UpdateVisualStudio();
+            ////await this.UpdateVisualStudio();
             await this.InstallDotNetSdk("3.1.x", "5.x.x", "6.x.x", "7.x.x");
         });
 

diff --git a/src/S7PlcRx.TestApp/Program.cs b/src/S7PlcRx.TestApp/Program.cs
@@ -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)
@@ -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)

diff --git a/src/S7PlcRx/Core/PLCRequest.cs b/src/S7PlcRx/Core/PLCRequest.cs
@@ -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;
 }