Merge pull request #9 from dotnetprojects/featureSafety

support safety times

Author: guertel

TiaCodeGen.Tests/SampleTests.cs

@@ -5,6 +5,7 @@
 using TiaCodegen.Commands;
 using TiaCodegen.Commands.Coils;
 using TiaCodegen.Commands.Comparisons;
+using TiaCodegen.Commands.Functions;
 using TiaCodegen.Commands.Functions.Base;
 using TiaCodegen.Commands.Signals;
 using TiaCodegen.Enums;
@@ -201,5 +202,22 @@ public void TestCallWithInRange()
             block.Interface = TestInterface;
             var xml = block.GetCode();
         }
+
+        [Test]
+        public void TestCallWithTOn()
+        {
+            var codeblock = new CodeBlock() { Safety = true };
+
+            var nw = new Network("Test2", "Test2en");
+
+            var f = new TONCall("Hallo", pt: new Signal("T#4m", SignalType.ConstantTime));
+            nw.Add(f);
+
+            codeblock.Add(nw);
+
+            var block = new Block("Test", "blabla", codeblock);
+            block.Interface = TestInterface;
+            var xml = block.GetCode();
+        }
     }
 }

TiaCodegen/CodeGen/KopCodeHelper.cs

@@ -1,4 +1,5 @@
-using System;
+using DotNetProjects.TiaCodegen.Extensions;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -273,6 +274,10 @@ private void AddContactDefinitions(Network network, CodeBlock block)
                     if (fc.TemplateValueName != null)
                     {
                         _sb.AppendLine("<TemplateValue Name=\"" + fc.TemplateValueName + "\" Type=\"" + fc.TemplateValueType + "\">" + fc.TemplateValue + "</TemplateValue>");
+                        if (!string.IsNullOrEmpty(fc.SafetyTemplateString) && fc.TryGetParent<CodeBlock>()?.Safety == true)
+                        {
+                            _sb.AppendLine(fc.SafetyTemplateString);
+                        }
                     }
 
                     if (_block.Safety && fc.AdditionalSafetyTemplateValues != null)
@@ -920,6 +925,7 @@ private void SetParent(IOperationOrSignal s)
             }
         }
 
+       
         public string GetXml(ref int id)
         {
             FixChildAndsAndSingleOr(_block);

TiaCodegen/Commands/Functions/Base/FunctionCall.cs

@@ -7,6 +7,8 @@ namespace TiaCodegen.Commands.Functions.Base
 {
     public class FunctionCall : IOperationOrSignal
     {
+        public string SafetyTemplateString { get; set; }
+
         public string DebugInfo { get; set; }
 
         public bool DisableEno { get; set; }

TiaCodegen/Commands/Functions/TOFFCall.cs

@@ -21,6 +21,11 @@ public TOFFCall(string instanceName,
             TemplateValue = "Time";
             HasNoEn = true;
 
+            SafetyTemplateString = @"      <TemplateValue Name=""f_user_card"" Type=""Cardinality"">1</TemplateValue>
+      <TemplateValue Name=""f_image_card"" Type=""Cardinality"">0</TemplateValue>
+      <TemplateValue Name=""f_imageclassic_card"" Type=""Cardinality"">0</TemplateValue>
+      <TemplateValue Name=""f_imageplus_card"" Type=""Cardinality"">0</TemplateValue>";
+
             Children.AddRange(Interface.Values.Where(x => x.OperationOrSignal != null).Select(x => x.OperationOrSignal));
         }
     }

TiaCodegen/Commands/Functions/TONCall.cs

@@ -21,6 +21,11 @@ public TONCall(string instanceName,
             TemplateValue = "Time";
             HasNoEn = true;
 
+            SafetyTemplateString = @"      <TemplateValue Name=""f_user_card"" Type=""Cardinality"">1</TemplateValue>
+      <TemplateValue Name=""f_image_card"" Type=""Cardinality"">0</TemplateValue>
+      <TemplateValue Name=""f_imageclassic_card"" Type=""Cardinality"">0</TemplateValue>
+      <TemplateValue Name=""f_imageplus_card"" Type=""Cardinality"">0</TemplateValue>";
+
             Children.AddRange(Interface.Values.Where(x => x.OperationOrSignal != null).Select(x => x.OperationOrSignal));
         }
     }

TiaCodegen/Commands/Functions/TONRCall.cs

@@ -23,6 +23,11 @@ public TONRCall(string instanceName,
             TemplateValue = "Time";
             HasNoEn = true;
 
+            SafetyTemplateString = @"      <TemplateValue Name=""f_user_card"" Type=""Cardinality"">1</TemplateValue>
+      <TemplateValue Name=""f_image_card"" Type=""Cardinality"">0</TemplateValue>
+      <TemplateValue Name=""f_imageclassic_card"" Type=""Cardinality"">0</TemplateValue>
+      <TemplateValue Name=""f_imageplus_card"" Type=""Cardinality"">0</TemplateValue>";
+
             Children.AddRange(Interface.Values.Where(x => x.OperationOrSignal != null).Select(x => x.OperationOrSignal));
         }
     }

TiaCodegen/Extensions/OperationOrSignalExtensions.cs

@@ -0,0 +1,19 @@
+using TiaCodegen.Interfaces;
+
+namespace DotNetProjects.TiaCodegen.Extensions
+{
+    public static class OperationOrSignalExtensions
+    {
+        public static T TryGetParent<T>(this IOperationOrSignal op) where T : IOperationOrSignal
+        {
+            var chk = op.Parent;
+            while (chk != null)
+            {
+                if (chk is T)
+                    return (T)chk;
+                chk = chk.Parent;
+            }
+            return default(T);
+        }
+    }
+}