Mercurial Mercurial > matiec / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
Fixing implementation of CU, CD, and CUD in standard library.
authorMario de Sousa <msousa@fe.up.pt>
Thu, 14 Apr 2011 19:17:20 +0100
changeset 290 013eab46aebb
parent 289 02d0c5844a82
child 291 1b0686c546ab
child 295 e7ce7c6bbb5d
Fixing implementation of CU, CD, and CUD in standard library.
lib/counter.txt file | annotate | diff | comparison | revisions 
--- a/lib/counter.txt	Thu Apr 14 19:02:35 2011 +0100
+++ b/lib/counter.txt	Thu Apr 14 19:17:20 2011 +0100
@@ -25,6 +25,7 @@
 (*                *)
 (******************)
 
+
 FUNCTION_BLOCK CTU
   VAR_INPUT
     CU : BOOL;
@@ -35,8 +36,13 @@
     Q : BOOL;
     CV : INT;
   END_VAR
-  IF R THEN CV := 0 ;
-  ELSIF CU AND (CV < PV)
+  VAR
+    CU_T: R_TRIG;
+  END_VAR
+
+  CU_T(CU);
+  IF R THEN CV := 0 ;
+  ELSIF CU_T.Q AND (CV < PV)
        THEN CV := CV+1;
   END_IF ;
   Q := (CV >= PV) ;
@@ -53,8 +59,13 @@
     Q : BOOL;
     CV : DINT;
   END_VAR
-  IF R THEN CV := 0 ;
-  ELSIF CU AND (CV < PV)
+  VAR
+    CU_T: R_TRIG;
+  END_VAR
+
+  CU_T(CU);
+  IF R THEN CV := 0 ;
+  ELSIF CU_T.Q AND (CV < PV)
        THEN CV := CV+1;
   END_IF ;
   Q := (CV >= PV) ;
@@ -71,8 +82,13 @@
     Q : BOOL;
     CV : LINT;
   END_VAR
-  IF R THEN CV := 0 ;
-  ELSIF CU AND (CV < PV)
+  VAR
+    CU_T: R_TRIG;
+  END_VAR
+
+  CU_T(CU);
+  IF R THEN CV := 0 ;
+  ELSIF CU_T.Q AND (CV < PV)
        THEN CV := CV+1;
   END_IF ;
   Q := (CV >= PV) ;
@@ -89,8 +105,13 @@
     Q : BOOL;
     CV : UDINT;
   END_VAR
-  IF R THEN CV := 0 ;
-  ELSIF CU AND (CV < PV)
+  VAR
+    CU_T: R_TRIG;
+  END_VAR
+
+  CU_T(CU);
+  IF R THEN CV := 0 ;
+  ELSIF CU_T.Q AND (CV < PV)
        THEN CV := CV+1;
   END_IF ;
   Q := (CV >= PV) ;
@@ -107,8 +128,13 @@
     Q : BOOL;
     CV : ULINT;
   END_VAR
-  IF R THEN CV := 0 ;
-  ELSIF CU AND (CV < PV)
+  VAR
+    CU_T: R_TRIG;
+  END_VAR
+
+  CU_T(CU);
+  IF R THEN CV := 0 ;
+  ELSIF CU_T.Q AND (CV < PV)
        THEN CV := CV+1;
   END_IF ;
   Q := (CV >= PV) ;
@@ -137,8 +163,13 @@
     Q : BOOL;
     CV : INT;
   END_VAR
+  VAR
+    CD_T: R_TRIG;
+  END_VAR
+
+  CD_T(CD);
   IF LD THEN CV := PV ;
-  ELSIF CD AND (CV > 0)
+  ELSIF CD_T.Q AND (CV > 0)
       THEN CV := CV-1;
   END_IF ;
   Q := (CV <= 0) ;
@@ -155,8 +186,13 @@
     Q : BOOL;
     CV : DINT;
   END_VAR
+  VAR
+    CD_T: R_TRIG;
+  END_VAR
+
+  CD_T(CD);
   IF LD THEN CV := PV ;
-  ELSIF CD AND (CV > 0)
+  ELSIF CD_T.Q AND (CV > 0)
       THEN CV := CV-1;
   END_IF ;
   Q := (CV <= 0) ;
@@ -173,8 +209,13 @@
     Q : BOOL;
     CV : LINT;
   END_VAR
+  VAR
+    CD_T: R_TRIG;
+  END_VAR
+
+  CD_T(CD);
   IF LD THEN CV := PV ;
-  ELSIF CD AND (CV > 0)
+  ELSIF CD_T.Q AND (CV > 0)
       THEN CV := CV-1;
   END_IF ;
   Q := (CV <= 0) ;
@@ -191,8 +232,13 @@
     Q : BOOL;
     CV : UDINT;
   END_VAR
+  VAR
+    CD_T: R_TRIG;
+  END_VAR
+
+  CD_T(CD);
   IF LD THEN CV := PV ;
-  ELSIF CD AND (CV > 0)
+  ELSIF CD_T.Q AND (CV > 0)
       THEN CV := CV-1;
   END_IF ;
   Q := (CV <= 0) ;
@@ -209,8 +255,13 @@
     Q : BOOL;
     CV : ULINT;
   END_VAR
+  VAR
+    CD_T: R_TRIG;
+  END_VAR
+
+  CD_T(CD);
   IF LD THEN CV := PV ;
-  ELSIF CD AND (CV > 0)
+  ELSIF CD_T.Q AND (CV > 0)
       THEN CV := CV-1;
   END_IF ;
   Q := (CV <= 0) ;
@@ -237,13 +288,21 @@
     QD : BOOL;
     CV : INT;
   END_VAR
+  VAR
+    CD_T: R_TRIG;
+    CU_T: R_TRIG;
+  END_VAR
+
+  CD_T(CD);
+  CU_T(CU);
+
   IF R THEN CV := 0 ;
   ELSIF LD THEN CV := PV ;
   ELSE
-    IF NOT (CU AND CD) THEN
-      IF CU AND (CV < PV)
+    IF NOT (CU_T.Q AND CD_T.Q) THEN
+      IF CU_T.Q AND (CV < PV)
       THEN CV := CV+1;
-      ELSIF CD AND (CV > 0)
+      ELSIF CD_T.Q AND (CV > 0)
       THEN CV := CV-1;
       END_IF;
     END_IF;
@@ -266,13 +325,21 @@
     QD : BOOL;
     CV : DINT;
   END_VAR
+  VAR
+    CD_T: R_TRIG;
+    CU_T: R_TRIG;
+  END_VAR
+
+  CD_T(CD);
+  CU_T(CU);
+
   IF R THEN CV := 0 ;
   ELSIF LD THEN CV := PV ;
   ELSE
-    IF NOT (CU AND CD) THEN
-      IF CU AND (CV < PV)
+    IF NOT (CU_T.Q AND CD_T.Q) THEN
+      IF CU_T.Q AND (CV < PV)
       THEN CV := CV+1;
-      ELSIF CD AND (CV > 0)
+      ELSIF CD_T.Q AND (CV > 0)
       THEN CV := CV-1;
       END_IF;
     END_IF;
@@ -295,13 +362,21 @@
     QD : BOOL;
     CV : LINT;
   END_VAR
+  VAR
+    CD_T: R_TRIG;
+    CU_T: R_TRIG;
+  END_VAR
+
+  CD_T(CD);
+  CU_T(CU);
+
   IF R THEN CV := 0 ;
   ELSIF LD THEN CV := PV ;
   ELSE
-    IF NOT (CU AND CD) THEN
-      IF CU AND (CV < PV)
+    IF NOT (CU_T.Q AND CD_T.Q) THEN
+      IF CU_T.Q AND (CV < PV)
       THEN CV := CV+1;
-      ELSIF CD AND (CV > 0)
+      ELSIF CD_T.Q AND (CV > 0)
       THEN CV := CV-1;
       END_IF;
     END_IF;
@@ -324,13 +399,21 @@
     QD : BOOL;
     CV : UDINT;
   END_VAR
+  VAR
+    CD_T: R_TRIG;
+    CU_T: R_TRIG;
+  END_VAR
+
+  CD_T(CD);
+  CU_T(CU);
+
   IF R THEN CV := 0 ;
   ELSIF LD THEN CV := PV ;
   ELSE
-    IF NOT (CU AND CD) THEN
-      IF CU AND (CV < PV)
+    IF NOT (CU_T.Q AND CD_T.Q) THEN
+      IF CU_T.Q AND (CV < PV)
       THEN CV := CV+1;
-      ELSIF CD AND (CV > 0)
+      ELSIF CD_T.Q AND (CV > 0)
       THEN CV := CV-1;
       END_IF;
     END_IF;
@@ -353,13 +436,21 @@
     QD : BOOL;
     CV : ULINT;
   END_VAR
+  VAR
+    CD_T: R_TRIG;
+    CU_T: R_TRIG;
+  END_VAR
+
+  CD_T(CD);
+  CU_T(CU);
+
   IF R THEN CV := 0 ;
   ELSIF LD THEN CV := PV ;
   ELSE
-    IF NOT (CU AND CD) THEN
-      IF CU AND (CV < PV)
+    IF NOT (CU_T.Q AND CD_T.Q) THEN
+      IF CU_T.Q AND (CV < PV)
       THEN CV := CV+1;
-      ELSIF CD AND (CV > 0)
+      ELSIF CD_T.Q AND (CV > 0)
       THEN CV := CV-1;
       END_IF;
     END_IF;
matiec