# HG changeset patch # User laurent # Date 1347374111 -7200 # Node ID c6ed7b933617a2fe702a351c798ae0cea8ccc7cd # Parent 050045c32d988d69185b45cefdb42594b2269900 Remove restriction of function block usage in SFC transitions body diff -r 050045c32d98 -r c6ed7b933617 PLCControler.py --- a/PLCControler.py Tue Sep 11 16:33:39 2012 +0200 +++ b/PLCControler.py Tue Sep 11 16:35:11 2012 +0200 @@ -1468,7 +1468,7 @@ if words[0] in ["P","T","A"]: name = words[1] type = self.GetPouType(name, debug) - if type == "function" or words[0] == "T": + if type == "function": blocktypes = [] for category in BlockTypes + self.GetConfNodeBlockTypes(): cat = {"name" : category["name"], "list" : []} diff -r 050045c32d98 -r c6ed7b933617 editors/Viewer.py --- a/editors/Viewer.py Tue Sep 11 16:33:39 2012 +0200 +++ b/editors/Viewer.py Tue Sep 11 16:35:11 2012 +0200 @@ -234,8 +234,6 @@ message = _("\"%s\" can't use itself!")%pou_name elif pou_type == "function" and values[1] != "function": message = _("Function Blocks can't be used in Functions!") - elif words[0] == "T" and values[1] != "function": - message = _("Function Blocks can't be used in Transitions!") elif self.ParentWindow.Controler.PouIsUsedBy(pou_name, values[0], self.ParentWindow.Debug): message = _("\"%s\" is already used by \"%s\"!")%(pou_name, values[0]) else: