Merge pull request #36 from simatic-ax/add_two_way_actuator

Add two way actuator
simatic-ax · Oct 18, 2024 · 352847d · 352847d
2 parents d4e883f + 5a152c6
commit 352847d
Show file tree

Hide file tree

Showing 11 changed files with 353 additions and 159 deletions.
diff --git a/README.md b/README.md
@@ -56,21 +56,21 @@ classDiagram
     }
 ```
 
-### Class ActuatorTimeBased
+### Class TimeBasedActuator
 
 ```mermaid
 ---
-title: ActuatorTimeBased
+title: TimeBasedActuator
 ---
 classDiagram
-    ControlModuleAbstract <|-- ActuatorTimeBased
+    ControlModuleAbstract <|-- TimeBasedActuator
     class ControlModuleAbstract{
         +WORD GetErrorStatus()
     }
-    class ActuatorTimeBased{
+    class TimeBasedActuator{
         +QControl : IBinOutput;
         +OnDuration : TIME;
-        +itfCommand Start()
+        +itfCommand GoToWorkPosition()
     }
 ```
 
@@ -82,7 +82,7 @@ classDiagram
 
 ```iec-st
   VAR_GLOBAL
-      Actuator : ActuatorTimeBased := (QControl := Q_Actuator) ;
+      Actuator : TimeBasedActuator := (QControl := Q_Actuator) ;
       Q_Actuator : BinOutput;
       DQ : BOOL;
   END_VAR

diff --git a/apax-lock.json b/apax-lock.json
@@ -2,35 +2,35 @@
   "name": "@simatic-ax/axftcmlib",
   "version": "0.0.0-placeholder",
   "lockFileVersion": "2",
-  "installStrategy": "overridable",
+  "installStrategy": "strict",
   "root": {
     "name": "@simatic-ax/axftcmlib",
     "version": "0.0.0-placeholder",
     "dependencies": {
       "@ax/simatic-1500-clocks": "7.0.4",
-      "@simatic-ax/simple-control-modules": "6.0.0",
-      "@simatic-ax/io": "6.0.0",
-      "@ax/system-timer": "7.0.17",
+      "@simatic-ax/simple-control-modules": "6.1.0",
+      "@simatic-ax/io": "6.1.0",
+      "@ax/system-timer": "7.1.47",
       "@simatic-ax/commands": "1.0.0",
-      "@simatic-ax/statemachine": "^6.0.1",
+      "@simatic-ax/statemachine": "6.1.0",
       "@simatic-ax/types": "^1.0.0"
     },
     "devDependencies": {
-      "@ax/sdk": "2405.0.0",
-      "@ax/axunitst": "^5.1.23",
+      "@ax/sdk": "2405.1.0",
+      "@ax/axunitst": "5.2.6",
       "@simatic-ax/snippetscollection": "1.0.0"
     }
   },
   "packages": {
     "@ax/sdk": {
       "name": "@ax/sdk",
-      "version": "2405.0.0",
-      "integrity": "sha512-Gm+Et1l37wDwHr4tpa0TqB71TwudQaXJpR53NI7PGh+uEljyu1xzArZorj0NUiMSi/GMj2xi//JWsfS8iWDkbg==",
-      "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdk/-/sdk-2405.0.0.tgz",
+      "version": "2405.1.0",
+      "integrity": "sha512-N8/ybtKh8qATtWWd4EWnGtgNGJlwmDffoXimmplBe9xsn6zkVslm5nP7dkky8CB3yIqWn4xiiQyqR0a8p6kXPw==",
+      "resolved": "https://registry.simatic-ax.siemens.io/@ax/sdk/-/sdk-2405.1.0.tgz",
       "dependencies": {
-        "@ax/apax-build": "1.0.0",
-        "@ax/axunitst": "5.0.74",
-        "@ax/axunitst-ls-contrib": "5.0.74",
+        "@ax/apax-build": "1.1.0",
+        "@ax/axunitst": "5.2.6",
+        "@ax/axunitst-ls-contrib": "5.2.6",
         "@ax/certificate-management": "1.1.2",
         "@ax/diagnostic-buffer": "1.3.1",
         "@ax/hwc": "1.0.225",
@@ -41,7 +41,7 @@
         "@ax/plc-info": "2.4.0",
         "@ax/sdb": "1.2.2",
         "@ax/simatic-pragma-stc-plugin": "4.0.18",
-        "@ax/sld": "2.5.7",
+        "@ax/sld": "2.5.10",
         "@ax/st-ls": "7.0.52",
         "@ax/stc": "7.0.52",
         "@ax/target-llvm": "7.0.52",
@@ -77,28 +77,28 @@
     },
     "@simatic-ax/simple-control-modules": {
       "name": "@simatic-ax/simple-control-modules",
-      "version": "6.0.0",
-      "integrity": "sha512-1VPYgkwxNljCJTITTR9ns7WGw+HMn4xq7zuSYTSrDQygomkuXDfydNYgu1/iTqk0Jv3OlPaMC3SuASZlc2XVRA==",
-      "resolved": "https://npm.pkg.github.com/download/@simatic-ax/simple-control-modules/6.0.0/c9b1263348fbb676e4bae43efaf1f9ebfd660e9f",
+      "version": "6.1.0",
+      "integrity": "sha512-OlpJ1XXyhHYxMatKmZ4SQMsBOW1Cv+Atuuamx0tOYit/XOqkx5KjXh7u7veJA05nlZVN8Jq31+gIK9R/8MJbsQ==",
+      "resolved": "https://npm.pkg.github.com/download/@simatic-ax/simple-control-modules/6.1.0/f968bfcf5273515adcb2d3884b73c31dde92e419",
       "dependencies": {
-        "@ax/system-timer": "7.0.17",
-        "@simatic-ax/io": "6.0.0"
+        "@ax/system-timer": "7.1.47",
+        "@simatic-ax/io": "6.1.0"
       }
     },
     "@simatic-ax/io": {
       "name": "@simatic-ax/io",
-      "version": "6.0.0",
-      "integrity": "sha512-4HoXkzHNubr/tksNCbYNdyPHyl3iY2HuWfalvBLyomqthIh262k/MAdk9yjURoTI91Uzd88s3TTHrS2wWFI0mQ==",
-      "resolved": "https://npm.pkg.github.com/download/@simatic-ax/io/6.0.0/a41b213542c3e91485f6500466bba00cc630cd61",
+      "version": "6.1.0",
+      "integrity": "sha512-JnSm9RJ23hoIl67e1v7gU46DG6IRNNpQPh0H+Lm6zLHG6cCsJeyaKlBhdlTNglSvu7RN3lzV45wPK1bf3oQGJQ==",
+      "resolved": "https://npm.pkg.github.com/download/@simatic-ax/io/6.1.0/aac5ac5162048e066ff96c5b4425beeafb00fc7c",
       "dependencies": {
-        "@ax/system-timer": "7.0.17"
+        "@ax/system-timer": "^7.1.47"
       }
     },
     "@ax/system-timer": {
       "name": "@ax/system-timer",
-      "version": "7.0.17",
-      "integrity": "sha512-JC2qA1x0C1loDgzyTO3T3GxT5a7VjXWhRMBovIhoTwbXmY/hs1nD28DvpIPCU1hNz6vxCV0s/BDw+ZwkZXx6hA==",
-      "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-timer/-/system-timer-7.0.17.tgz",
+      "version": "7.1.47",
+      "integrity": "sha512-RnY3X/Glo9rClP+V5GVOCi5PFDXjWrNnXzVCX4GnDmcRG+fSfpelkghRgqMsSoFxc56m1AGbAsfa6PUxHqwtLw==",
+      "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-timer/-/system-timer-7.1.47.tgz",
       "dependencies": {}
     },
     "@simatic-ax/commands": {
@@ -110,11 +110,11 @@
     },
     "@simatic-ax/statemachine": {
       "name": "@simatic-ax/statemachine",
-      "version": "6.0.1",
-      "integrity": "sha512-bsD59xTjWNWMEDIT9mWZLvw4EL90jFC5IYVhHMPgHf4ZgW0PyMgAhUU9DruLxm4f8pDkVgn5NkLOaOEjxM51Mg==",
-      "resolved": "https://npm.pkg.github.com/download/@simatic-ax/statemachine/6.0.1/a1dc020219f945a697b95aca4a3c52c674cf0b59",
+      "version": "6.1.0",
+      "integrity": "sha512-dzrkHN32gph5mDwkwfiLiMHx6Pig/RzG/CMDu3NGz7K6t81RWn2NJ4roS4WBTLScN/rq9cG8gbbeXieZ1lTdjg==",
+      "resolved": "https://npm.pkg.github.com/download/@simatic-ax/statemachine/6.1.0/60818c010cd6cfdf9a97809d647052ddf58071a2",
       "dependencies": {
-        "@ax/system-timer": "7.0.17"
+        "@ax/system-timer": "^7.1.47"
       }
     },
     "@simatic-ax/types": {
@@ -126,19 +126,19 @@
     },
     "@ax/apax-build": {
       "name": "@ax/apax-build",
-      "version": "1.0.0",
-      "integrity": "sha512-JxtOn/Mc7bYOjhIbu2FV4c+FvMLuC8kcb6mVleldl7uAID8qAxTZZsM1M+1wJnqe4v0RzO4BHIjdY3qsnikKhg==",
-      "resolved": "https://registry.simatic-ax.siemens.io/@ax/apax-build/-/apax-build-1.0.0.tgz",
+      "version": "1.1.0",
+      "integrity": "sha512-QzEMiuu3Z+wX9bBLxGclyVTJRi4tP3lL1dm0h2vV5QTn0NxX4tBlVhZQZu9ovi6ZFbxCuvwhC3aF+WW9tyvi+g==",
+      "resolved": "https://registry.simatic-ax.siemens.io/@ax/apax-build/-/apax-build-1.1.0.tgz",
       "dependencies": {
         "@ax/simatic-package-tool": "^1.0.3",
         "@ax/st-resources.stc-plugin": "^1.0.3"
       }
     },
     "@ax/axunitst-ls-contrib": {
       "name": "@ax/axunitst-ls-contrib",
-      "version": "5.0.74",
-      "integrity": "sha512-WnUPub5PgxXbq0QfKVi9b73fKVSDwlM/Ibz1wXwJdtoFYqiHQrk2L+7/EQyrJfTQXnNeuLAMXpmjsoHnxd09/w==",
-      "resolved": "https://registry.simatic-ax.siemens.io/@ax/axunitst-ls-contrib/-/axunitst-ls-contrib-5.0.74.tgz",
+      "version": "5.2.6",
+      "integrity": "sha512-EYUQje4GcJSV3efTe1WqYanxV54dO0kuxrtBLUhpQ20JezqVRYUE4BQF4jpfnhGJVFs4rW5J3BAlYEaBBhW7pg==",
+      "resolved": "https://registry.simatic-ax.siemens.io/@ax/axunitst-ls-contrib/-/axunitst-ls-contrib-5.2.6.tgz",
       "dependencies": {}
     },
     "@ax/certificate-management": {
@@ -240,9 +240,9 @@
     },
     "@ax/sld": {
       "name": "@ax/sld",
-      "version": "2.5.7",
-      "integrity": "sha512-LSa6MtCF/l1J/S5c8NsaQTE84X+nAHoLjdqwRRLX97zHs3GVuan6sfC+VhyniiXrI201Bvwky4po18pT7IeY2Q==",
-      "resolved": "https://registry.simatic-ax.siemens.io/@ax/sld/-/sld-2.5.7.tgz",
+      "version": "2.5.10",
+      "integrity": "sha512-Y8WifYuvBpejU/39/hb15FJClTp/UB1HMU45pO2NvLCfdsCcd2Gj0uDGZ5B9iMOoCpTFTnaXZaEUof+apwrpxw==",
+      "resolved": "https://registry.simatic-ax.siemens.io/@ax/sld/-/sld-2.5.10.tgz",
       "cpu": [
         "x64"
       ],
@@ -690,22 +690,14 @@
       ],
       "dependencies": {}
     },
-    "@ax/st-docs": {
-      "name": "@ax/st-docs",
-      "version": "7.0.52",
-      "integrity": "sha512-iKLQAGv6Au/CsImP/RmCy0nRIUCQMjrAdgo/AmWrH3+MvPLjhowbsNSQsq1YUP34PbYI0ThH6tQjkUta2dFc7A==",
-      "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-7.0.52.tgz",
-      "dependencies": {},
-      "deprecated": ""
-    },
     "@ax/system-strings": {
       "name": "@ax/system-strings",
-      "version": "7.0.17",
-      "integrity": "sha512-xrT2GzVqeTXVF5Nq7wXKwYTb9FqIV3F5DWWGGEUwZvrm5t2unyFqsBDXoFBWDicPuhUFaH0FUwp1NqvMSN95pQ==",
-      "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-strings/-/system-strings-7.0.17.tgz",
+      "version": "7.1.47",
+      "integrity": "sha512-ERClBkAtu1dabBJFMZvA7RUPNwnaXfQC3B81IbRFtWcBTKso6qIgqGe9uku9TdSBYqfrQgwDkxneJtJNDDm5Kg==",
+      "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-strings/-/system-strings-7.1.47.tgz",
       "dependencies": {
-        "@ax/system-math": "7.0.17",
-        "@ax/system-datetime": "7.0.17"
+        "@ax/system-math": "^7.1.47",
+        "@ax/system-datetime": "^7.1.47"
       }
     },
     "@ax/axunitst-test-director-linux-x64": {
@@ -760,20 +752,27 @@
       ],
       "dependencies": {}
     },
+    "@ax/st-docs": {
+      "name": "@ax/st-docs",
+      "version": "7.0.52",
+      "integrity": "sha512-iKLQAGv6Au/CsImP/RmCy0nRIUCQMjrAdgo/AmWrH3+MvPLjhowbsNSQsq1YUP34PbYI0ThH6tQjkUta2dFc7A==",
+      "resolved": "https://registry.simatic-ax.siemens.io/@ax/st-docs/-/st-docs-7.0.52.tgz",
+      "dependencies": {},
+      "deprecated": ""
+    },
     "@ax/system-math": {
       "name": "@ax/system-math",
-      "version": "7.0.17",
-      "integrity": "sha512-nHwRWg5Skzq3dgV29XVa7wni0ZQkn/ff6csYxrS7IsNKGb2nKOAJQFb/WzrfcxbsTYhTPOyifI6ulDgMu50Y6w==",
-      "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-math/-/system-math-7.0.17.tgz",
+      "version": "7.1.47",
+      "integrity": "sha512-xU30iSLTLTcSLSRrww4tguGUPr4lyiwHJBexUmsLXEBy/OyJqkwEJbY6gzGCJ6ciGXSQUVEkbfKM/blIztMzAA==",
+      "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-math/-/system-math-7.1.47.tgz",
       "dependencies": {}
     },
     "@ax/system-datetime": {
       "name": "@ax/system-datetime",
-      "version": "7.0.17",
-      "integrity": "sha512-mgB6+Ln5eLXsGJb4nl6/sW7SwAipSrFvttMWGAJMOym3qx7F1MuAdcZ6NaRS0rV0mpyyTEzgG3sk2voMN1OK1Q==",
-      "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-datetime/-/system-datetime-7.0.17.tgz",
-      "dependencies": {},
-      "deprecated": ""
+      "version": "7.1.47",
+      "integrity": "sha512-yk8erRctiVKHjpe1nca9WUhatotm6S5lEkye4R2XBl7vU7CaPp84q7MzhkSCgQYn08LJqlFRBbxP+bpERiei8g==",
+      "resolved": "https://registry.simatic-ax.siemens.io/@ax/system-datetime/-/system-datetime-7.1.47.tgz",
+      "dependencies": {}
     }
   },
   "workspaces": {}

diff --git a/apax.yml b/apax.yml
@@ -23,8 +23,8 @@ targets:
 apaxVersion: 3.2.1
 # Dependencies
 devDependencies:
-  '@ax/sdk': 2405.0.0
-  "@ax/axunitst": ^5.1.23
+  '@ax/sdk': 2405.1.0
+  "@ax/axunitst": 5.2.6
   "@simatic-ax/snippetscollection": 1.0.0
 # Files, which will be shipped with the library
 files:
@@ -35,11 +35,11 @@ files:
   - 'snippets'
 dependencies:
   "@ax/simatic-1500-clocks": 7.0.4
-  "@simatic-ax/simple-control-modules": 6.0.0
-  "@simatic-ax/io": 6.0.0
-  "@ax/system-timer": 7.0.17
+  "@simatic-ax/simple-control-modules": 6.1.0
+  "@simatic-ax/io": 6.1.0
+  "@ax/system-timer": 7.1.47
   "@simatic-ax/commands": 1.0.0
-  "@simatic-ax/statemachine": ^6.0.1
+  "@simatic-ax/statemachine": 6.1.0
   "@simatic-ax/types": ^1.0.0
   # "@ax/simatic-1500-technology-objects": ^0.1.52
-installStrategy: overridable
+installStrategy: strict
diff --git a/src/Actuator/ActuatorStates.st b/src/Actuator/ActuatorStates.st
@@ -1,5 +1,5 @@
 NAMESPACE Simatic.Ax.axftcmlib
     TYPE
-        ActuatorState : (Retracted, Activating, Activated, Retracting) := Retracted;
+        ActuatorState : (InHomePosition, MoveToWorkPosition, InWorkPosition, MoveToHomePosition) := InHomePosition;
     END_TYPE
 END_NAMESPACE
diff --git a/src/Actuator/ActuatorTimeBased.st b/src/Actuator/ActuatorTimeBased.st
diff --git a/src/Actuator/IActuator.st b/src/Actuator/IActuator.st