solve errors in Start method (#15)

simatic-ax · Jan 26, 2024 · 7408463 · 7408463
1 parent 83d8585
commit 7408463
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 43 deletions.
diff --git a/apax-lock.json b/apax-lock.json
@@ -229,6 +229,20 @@
         "@ax/system-datetime": "6.0.94"
       }
     },
+    "@ax/system-math": {
+      "name": "@ax/system-math",
+      "version": "6.0.94",
+      "integrity": "sha512-lmkqZnJRT6zjAaVEKgWDwB1J7st+rgj/lfJc+6PZ/zgiRxoJ/s7BSTl/6YQ6k12RskKrA4E5VvLiqJhaNd3ssw==",
+      "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-math/-/system-math-6.0.94.tgz",
+      "dependencies": {}
+    },
+    "@ax/system-datetime": {
+      "name": "@ax/system-datetime",
+      "version": "6.0.94",
+      "integrity": "sha512-8xn57nA5NfZ6ImTxmFGvzFp7wLL38JdUgjsuEg+xbzs29e8ftvbTCNqaWMVdX05N4QNAqohq2BlEkIyFtDH8Qg==",
+      "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-datetime/-/system-datetime-6.0.94.tgz",
+      "dependencies": {}
+    },
     "@ax/axunitst-library": {
       "name": "@ax/axunitst-library",
       "version": "4.1.8",
@@ -569,20 +583,6 @@
       ],
       "dependencies": {}
     },
-    "@ax/system-math": {
-      "name": "@ax/system-math",
-      "version": "6.0.94",
-      "integrity": "sha512-lmkqZnJRT6zjAaVEKgWDwB1J7st+rgj/lfJc+6PZ/zgiRxoJ/s7BSTl/6YQ6k12RskKrA4E5VvLiqJhaNd3ssw==",
-      "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-math/-/system-math-6.0.94.tgz",
-      "dependencies": {}
-    },
-    "@ax/system-datetime": {
-      "name": "@ax/system-datetime",
-      "version": "6.0.94",
-      "integrity": "sha512-8xn57nA5NfZ6ImTxmFGvzFp7wLL38JdUgjsuEg+xbzs29e8ftvbTCNqaWMVdX05N4QNAqohq2BlEkIyFtDH8Qg==",
-      "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-datetime/-/system-datetime-6.0.94.tgz",
-      "dependencies": {}
-    },
     "@ax/axunitst-runner-linux-x64": {
       "name": "@ax/axunitst-runner-linux-x64",
       "version": "4.1.8",

diff --git a/src/Blocks/Drives/classReadDriveParams.st b/src/Blocks/Drives/classReadDriveParams.st
@@ -393,7 +393,8 @@ NAMESPACE Simatic.Ax.LAcycCom
 
              // starts functionality
              IF not ((statFBState = LAcycCom_ReadWriteStatus#FB_IDLE OR
-                 statFBState = LAcycCom_ReadWriteStatus#FB_DONE) AND
+                 statFBState = LAcycCom_ReadWriteStatus#FB_DONE or 
+                 statFBState = LAcycCom_ReadWriteStatus#FB_ERROR) AND
                  statrequestBuffer <> NULL) THEN
                    Start := False;
              ELSE

diff --git a/src/Blocks/Drives/classReadDriveSingleParams.st b/src/Blocks/Drives/classReadDriveSingleParams.st
@@ -380,7 +380,8 @@ NAMESPACE Simatic.Ax.LAcycCom
 
              // starts functionality
              IF not ((statFBState = LAcycCom_ReadWriteStatus#FB_IDLE OR
-                 statFBState = LAcycCom_ReadWriteStatus#FB_DONE) AND
+                 statFBState = LAcycCom_ReadWriteStatus#FB_DONE or 
+                 statFBState = LAcycCom_ReadWriteStatus#FB_ERROR) AND
                  statrequestBuffer <> NULL) THEN
                    Start := False;
              ELSE

diff --git a/src/Blocks/Drives/classWriteDriveParams.st b/src/Blocks/Drives/classWriteDriveParams.st
@@ -583,7 +583,8 @@ NAMESPACE Simatic.Ax.LAcycCom
 
              // starts functionality
              IF not ((statFBState = LAcycCom_ReadWriteStatus#FB_IDLE OR
-                 statFBState = LAcycCom_ReadWriteStatus#FB_DONE) AND
+                 statFBState = LAcycCom_ReadWriteStatus#FB_DONE or 
+                 statFBState = LAcycCom_ReadWriteStatus#FB_ERROR) AND
                  statrequestBuffer <> NULL) THEN
                    Start := False;
              ELSE

diff --git a/src/Blocks/Drives/classWriteDriveSingleParams.st b/src/Blocks/Drives/classWriteDriveSingleParams.st
@@ -508,7 +508,8 @@ NAMESPACE Simatic.Ax.LAcycCom
 
              // starts functionality
              IF not ((statFBState = LAcycCom_ReadWriteStatus#FB_IDLE OR
-                 statFBState = LAcycCom_ReadWriteStatus#FB_DONE) AND
+                 statFBState = LAcycCom_ReadWriteStatus#FB_DONE or 
+                 statFBState = LAcycCom_ReadWriteStatus#FB_ERROR) AND
                  statrequestBuffer <> NULL) THEN
                    Start := False;
              ELSE

diff --git a/src/Types/DriveTypes.st b/src/Types/DriveTypes.st
@@ -11,21 +11,7 @@ NAMESPACE Simatic.Ax.LAcycCom
       END_STRUCT;
 
    END_TYPE
-(*
-   TYPE LAcycCom_typeDriveDiagnostics
 
-      : STRUCT
-         status : Word := word#16#0000;   // Status identifier when error occurred
-         subfunctionStatus : Word := word#16#0000;   // Block status or error information
-         stateNumber : SInt := sint#0;   // State of the FB when error occurred
-         driveObjectId : USInt := usint#0;   // Identification number of the drive object
-         hardwareId : HW_IO := HW_IO#default;   // Hardware identifier of the hardware module
-         parameterCount : Int := 0;   // Total amount of parameters
-         firstParameterError : Int := -1;   // Number of parameter at which the error occurred (-1: no parameter with error)
-         errorValue : Byte := byte#2#11111111;    // Error number (16#FF: no error; else: see error list)
-      END_STRUCT;
-   END_TYPE
-*)
 
       TYPE LAcycCom_ooptypeDriveDiagnostics
 
@@ -42,15 +28,4 @@ NAMESPACE Simatic.Ax.LAcycCom
 
    END_TYPE
 
-(*
-   TYPE LAcycCom_typeDriveMessages
-        : STRUCT
-            code : Array[0..typeconstantsint#LACYCCOM_MESSAGES_UPPER_LIM] of UInt;
-            info : Array[0..typeconstantsint#LACYCCOM_MESSAGES_UPPER_LIM] of UDInt;
-            comeDateAndTime : Array[0..typeconstantsint#LACYCCOM_MESSAGES_UPPER_LIM] of LDATE_AND_TIME;
-            Mtype  : Array[0..typeconstantsint#LACYCCOM_MESSAGES_UPPER_LIM] of SInt;
-         END_STRUCT;
-
-      END_TYPE
-*)
 END_NAMESPACE