# HG changeset patch
# User lbessard
# Date 1220279510 -7200
# Node ID 4a47ccafbef74c283df683b9de2925a29ecb6a8a
# Parent  9cf9694e8d66096fd483a922d66e248fe521eb9d
Inversion between TON and TOF comments and errors in IL keywords fixed

diff -r 9cf9694e8d66 -r 4a47ccafbef7 plcopen/structures.py
--- a/plcopen/structures.py	Mon Sep 01 16:29:50 2008 +0200
+++ b/plcopen/structures.py	Mon Sep 01 16:31:50 2008 +0200
@@ -174,12 +174,12 @@
                     "outputs" : [("Q","BOOL","none"),("ET","TIME","none")],
                     "comment" : "Pulse timer\nThe pulse timer can be used to generate output pulses of a given time duration.",
                     "generate" : generate_block, "initialise" : initialise_block},
-                {"name" : "TOF", "type" : "functionBlock", "extensible" : False, 
+                {"name" : "TON", "type" : "functionBlock", "extensible" : False, 
                     "inputs" : [("IN","BOOL","none"),("PT","TIME","none")], 
                     "outputs" : [("Q","BOOL","none"),("ET","TIME","none")],
                     "comment" : "On-delay timer\nThe on-delay timer can be used to delay setting an output true, for fixed period after an input becomes true.",
                     "generate" : generate_block, "initialise" : initialise_block},
-                {"name" : "TON", "type" : "functionBlock", "extensible" : False, 
+                {"name" : "TOF", "type" : "functionBlock", "extensible" : False, 
                     "inputs" : [("IN","BOOL","none"),("PT","TIME","none")], 
                     "outputs" : [("Q","BOOL","none"),("ET","TIME","none")],
                     "comment" : "Off-delay timer\nThe off-delay timer can be used to delay setting an output false, for fixed period after input goes false.",
@@ -586,7 +586,7 @@
 # Keywords for Instruction List
 IL_KEYWORDS = ["TRUE", "FALSE", "LD", "LDN", "ST", "STN", "S", "R", "AND", "ANDN", "OR", "ORN",
  "XOR", "XORN", "NOT", "ADD", "SUB", "MUL", "DIV", "MOD", "GT", "GE", "EQ", "NE",
- "LE", "LT", "JMP", "JMPC", "JMPNC", "CAL", "CALC", "CALNC", "RET", "RETC", "RETNC"]
+ "LE", "LT", "JMP", "JMPC", "JMPCN", "CAL", "CALC", "CALCN", "RET", "RETC", "RETCN"]
 
 
 # Keywords for Structured Text