# HG changeset patch
# User laurent
# Date 1328138982 -3600
# Node ID 2b9ed21d965cf2d989ab39685a5442e6650f6f95
# Parent  d8fe5a0f54037607e28b590ce5d2310f52fd7743
Fix issues with standard library definition

diff -r d8fe5a0f5403 -r 2b9ed21d965c PLCOpenEditor.py
--- a/PLCOpenEditor.py	Wed Feb 01 00:42:07 2012 +0100
+++ b/PLCOpenEditor.py	Thu Feb 02 00:29:42 2012 +0100
@@ -1916,7 +1916,7 @@
                     self.InstancesTree.SelectItem(item)
                     return True
                 else:
-                    found = self.SelectInstancesTreeItem(item, paths[1])
+                    found = self.RecursiveInstancesTreeItemSelection(item, paths[1])
             item, root_cookie = self.InstancesTree.GetNextChild(root, root_cookie)
         return found
     
diff -r d8fe5a0f5403 -r 2b9ed21d965c plcopen/iec_std.csv
--- a/plcopen/iec_std.csv	Wed Feb 01 00:42:07 2012 +0100
+++ b/plcopen/iec_std.csv	Thu Feb 02 00:29:42 2012 +0100
@@ -34,7 +34,7 @@
 ;MUL;1;(ANY_NUM, ANY_NUM);ANY_NUM;_("Multiplication");yes;(None, "__mul_", "return_type");copy_input
 ;SUB;1;(ANY_NUM, ANY_NUM);ANY_NUM;_("Subtraction");no;(None, "__sub_", "return_type");copy_input
 ;DIV;1;(ANY_NUM, ANY_NUM);ANY_NUM;_("Division");no;(None, "__div_", "return_type");copy_input
-;MOD;1;(ANY_NUM, ANY_NUM);ANY_NUM;_("Remainder (modulo)");no;(None, "__mod_", "return_type");copy_input
+;MOD;1;(ANY_INT, ANY_INT);ANY_INT;_("Remainder (modulo)");no;(None, "__mod_", "return_type");copy_input
 ;EXPT;1;(ANY_REAL, ANY_NUM);ANY_REAL;_("Exponent");no;(None, "__expt_", "IN1_type");IN1_type_symbol
 ;MOVE;1;(ANY);ANY;_("Assignment");no;(None, "__move_", "return_type");copy_input
 _("Time");ADD;1;(TIME, TIME);TIME;_("Time addition");no;(None, "__time_add", None);defined
diff -r d8fe5a0f5403 -r 2b9ed21d965c plcopen/structures.py
--- a/plcopen/structures.py	Wed Feb 01 00:42:07 2012 +0100
+++ b/plcopen/structures.py	Thu Feb 02 00:29:42 2012 +0100
@@ -240,9 +240,9 @@
                     "comment" : _("PID\nThe PID (proportional, Integral, Derivative) function block provides the classical three term controller for closed loop control."),
                     "generate" : generate_block, "initialise" : initialise_block},
                 {"name" : "RAMP", "type" : "functionBlock", "extensible" : False, 
-                    "inputs" : [("RUN","BOOL","none"),("X0","REAL","none"),("X1","REAL","none"),("TR","TIME","none"),("CYCLE","TIME","none"),("HOLDBACK","BOOL","none"),("ERROR","REAL","none"),("PV","REAL","none")], 
-                    "outputs" : [("RAMP","BOOL","none"),("XOUT","REAL","none")],
-                    "comment" : _("Ramp\nThe RAMP function block is modelled on example given in the standard but with the addition of a 'Holdback' feature."),
+                    "inputs" : [("RUN","BOOL","none"),("X0","REAL","none"),("X1","REAL","none"),("TR","TIME","none"),("CYCLE","TIME","none")], 
+                    "outputs" : [("BUSY","BOOL","none"),("XOUT","REAL","none")],
+                    "comment" : _("Ramp\nThe RAMP function block is modelled on example given in the standard."),
                     "generate" : generate_block, "initialise" : initialise_block},
                 {"name" : "HYSTERESIS", "type" : "functionBlock", "extensible" : False, 
                     "inputs" : [("XIN1","REAL","none"),("XIN2","REAL","none"),("EPS","REAL","none")],