PLCGenerator.py
changeset 2305 56f1d8aca886
parent 2269 2e38b5ec4753
parent 2277 068ccc02f5f2
child 2429 15f18dc8b56a
--- a/PLCGenerator.py	Wed Sep 12 11:36:50 2018 +0200
+++ b/PLCGenerator.py	Wed Sep 12 22:59:30 2018 +0200
@@ -926,15 +926,17 @@
         if blk is None:
             return None
 
-        if not isinstance(blk, (InVariableClass, InOutVariableClass)):
-            for invar in blk.inputVariables.getvariable():
-                if invar.getformalParameter() == "EN":
-                    if len(invar.getconnectionPointIn().getconnections()) > 0:
-                        if blk.getinstanceName() is None:
-                            var_name = "%s%d_ENO" % (blk.gettypeName(), blk.getlocalId())
-                        else:
-                            var_name = "%s.ENO" % blk.getinstanceName()
-                        return var_name
+        if not hasattr(blk, "inputVariables"):
+            return None
+
+        for invar in blk.inputVariables.getvariable():
+            if invar.getformalParameter() == "EN":
+                if len(invar.getconnectionPointIn().getconnections()) > 0:
+                    if blk.getinstanceName() is None:
+                        var_name = "%s%d_ENO" % (blk.gettypeName(), blk.getlocalId())
+                    else:
+                        var_name = "%s.ENO" % blk.getinstanceName()
+                    return var_name
         return None
 
     def ComputeProgram(self, pou):
@@ -1344,7 +1346,7 @@
                 else:
                     paths.append(variable)
             elif isinstance(next, CoilClass):
-                paths.append(str(self.GeneratePaths(next.connectionPointIn.getconnections(), body, order)))
+                paths.append(self.GeneratePaths(next.connectionPointIn.getconnections(), body, order))
         return paths
 
     def ComputePaths(self, paths, first=False):