suport SystemFunction CTU

dotnetprojects · Apr 15, 2024 · cea2c0c · cea2c0c
1 parent 3fbd8f3
commit cea2c0c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/TiaCodeGen.Tests/SampleTests.cs b/TiaCodeGen.Tests/SampleTests.cs
@@ -222,6 +222,23 @@ public void TestCallWithTOn()
             var xml = block.GetCode();
         }
 
+        [Test]
+        public void TestCallWithCTU()
+        {
+            var codeblock = new CodeBlock() { Safety = false };
+
+            var nw = new Network("Test2", "Test2en");
+
+            var f = new And(new Signal("aa"), new CTUCall("Hallo", r: new Signal("bbb", SignalType.Bool), pv: new Signal("2", SignalType.ConstantInt), q: new Coil(new Signal("ccc", SignalType.Bool))));
+            nw.Add(f);
+
+            codeblock.Add(nw);
+
+            var block = new Block("Test", "blabla", codeblock);
+            block.Interface = TestInterface;
+            var xml = block.GetCode();
+        }
+
         [Test]
         public void TestCallWithTPAndDistributor()
         {

diff --git a/TiaCodegen/CodeGen/KopCodeHelper.cs b/TiaCodegen/CodeGen/KopCodeHelper.cs
@@ -691,6 +691,10 @@ private void AddWires(IOperationOrSignal op)
                         {
                             _sb.AppendLine("<NameCon UId=\"" + next.OperationId + "\" Name=\"pre\" />" + "  <!-- " + dstName + " -->");
                         }
+                        else if (next is CTUCall)
+                        {
+                            _sb.AppendLine("<NameCon UId=\"" + next.OperationId + "\" Name=\"CU\" />" + "  <!-- " + dstName + " -->");
+                        }
                         else if (next is FunctionCall)
                         {
                             _sb.AppendLine("<NameCon UId=\"" + next.OperationId + "\" Name=\"" + (((FunctionCall)next).HasNoEn ? "in" : "en") + "\" />" + "  <!-- " + dstName + " -->");

diff --git a/TiaCodegen/Commands/Functions/CTUCall.cs b/TiaCodegen/Commands/Functions/CTUCall.cs
@@ -8,13 +8,11 @@ namespace TiaCodegen.Commands.Functions
     public class CTUCall : SystemFunctionBlockCall
     {
         public CTUCall(string instanceName,
-            IOperationOrSignal cu = null,
             IOperationOrSignal r = null,
             IOperationOrSignal pv = null,
             IOperationOrSignal q = null,
             IOperationOrSignal cv = null) : base("CTU", instanceName, null)
         {
-            Interface["CU"] = new IOperationOrSignalDirectionWrapper(cu, Direction.Input);
             Interface["R"] = new IOperationOrSignalDirectionWrapper(r, Direction.Input);
             Interface["PV"] = new IOperationOrSignalDirectionWrapper(pv, Direction.Input);
             Interface["Q"] = new IOperationOrSignalDirectionWrapper(q, Direction.Output);