Merge branch 'main' of github.com:simatic-ax/axftcmlib

.github/workflows/build-library.yml

@@ -7,4 +7,4 @@ jobs:
       APAX_TOKEN: ${{ secrets.APAX_TOKEN }}
       SIMATIC_AX_TOKEN: ${{ secrets.DEPLOY_KEY }}
     with:
-      LOGIN_SIMATIC_AX: true
+      LOGIN_SIMATIC_AX: true

apax.yml

@@ -15,12 +15,11 @@ variables:
     - '--debug'
 targets:
   - '1500'
-  - 'axunit-llvm'
-  # - 'llvm'
+  - 'llvm'
   # Dependencies
 devDependencies:
-  '@ax/sdk': ^4.0.8
-  "@simatic-ax/snippetscollection": ^0.1.3
+  '@ax/sdk': 2311.0.1
+  "@simatic-ax/snippetscollection": 1.0.0
 
 # Registry information, where the package will be published
 registries:
@@ -33,7 +32,7 @@ files:
   - 'src'
   - 'snippets'
 dependencies:
-  "@ax/simatic-1500-clocks": ^4.0.1
-  "@simatic-ax/simple-control-modules": ^4.0.1
-  "@simatic-ax/statemachine": ^4.0.1
-  "@simatic-ax/io": ^4.0.1
+  "@ax/simatic-1500-clocks": 6.0.37
+  "@simatic-ax/simple-control-modules": 5.0.1
+  "@simatic-ax/io": 5.0.0
+  "@ax/system-timer": 6.0.94

src/Actuator/ActuatorStates.st

@@ -0,0 +1,5 @@
+NAMESPACE Simatic.Ax.axftcmlib
+    TYPE
+        ActuatorState : (Retracted, Activating, Activated, Retracting) := Retracted;
+    END_TYPE
+END_NAMESPACE

src/Actuator/ActuatorTimeBased.st

@@ -0,0 +1,61 @@
+USING System.Timer;
+USING Simatic.Ax.Io.Output;
+
+NAMESPACE Simatic.Ax.axftcmlib
+
+    CLASS ActuatorTimeBased
+        EXTENDS ControlModuleAbstract
+        IMPLEMENTS IActuator
+        VAR PUBLIC
+            ControlPush : IBinOutput;
+            OnDuration : TIME;
+        END_VAR
+        VAR
+            _tonOnDuration : OnDelay;
+            _state : ActuatorState;
+        END_VAR
+
+        METHOD PROTECTED OVERRIDE _constructor
+            ;
+        END_METHOD
+
+        METHOD PROTECTED OVERRIDE _runCyclicCustom
+            IF (ControlPush = NULL) THEN 
+                THIS.SetError(WORD#16#8101);
+                RETURN;
+            ELSE
+                THIS.SetError(FALSE);
+            END_IF;
+            _tonOnDuration(signal := ControlPush.IsOn(), Duration := OnDuration);
+            CASE _state OF
+                ActuatorState#Retracted:
+                    // IF () 
+                    ControlPush.SetOff();
+                ActuatorState#Activating:
+                    ControlPush.SetOn();
+                    _state := ActuatorState#Activated;
+                ActuatorState#Activated:
+                    IF (_tonOnDuration.output) THEN
+                        _state := ActuatorState#Retracting;
+                        ControlPush.SetOff();
+                    END_IF;
+                ActuatorState#Retracting:
+                    ControlPush.SetOff();
+                    _state := ActuatorState#Retracted;
+            END_CASE;
+        END_METHOD
+
+        METHOD PUBLIC Enable
+            _state := ActuatorState#Activating;
+        END_METHOD
+
+        METHOD PUBLIC Disable
+            _state := ActuatorState#Retracted;
+        END_METHOD
+
+        METHOD PUBLIC GetState : ActuatorState
+            GetState := _state;
+        END_METHOD
+    END_CLASS
+
+END_NAMESPACE

src/Actuator/IActuator.st

@@ -0,0 +1,8 @@
+NAMESPACE Simatic.Ax.axftcmlib
+    INTERFACE IActuator
+        METHOD Enable END_METHOD
+        METHOD Disable END_METHOD
+        METHOD GetState : ActuatorState
+        END_METHOD
+    END_INTERFACE
+END_NAMESPACE

src/ControlModuleAbstract.st

@@ -7,6 +7,8 @@ NAMESPACE Simatic.Ax.axftcmlib
         END_VAR
         VAR PROTECTED
             _init : BOOL;
+            _hasError : BOOL;
+            _errorState : WORD;
         END_VAR
 
         METHOD PUBLIC RunCyclic
@@ -25,6 +27,33 @@ NAMESPACE Simatic.Ax.axftcmlib
         METHOD PROTECTED ABSTRACT _constructor
 
         END_METHOD
+
+        METHOD PROTECTED SetError
+            VAR_INPUT
+                ErrorCode : WORD;
+            END_VAR
+            _errorState := ErrorCode;
+            _hasError := TRUE;
+            ;
+        END_METHOD
+
+        METHOD PROTECTED SetError
+            VAR_INPUT
+                Set : BOOL;
+            END_VAR
+            _hasError := Set;
+            ;
+        END_METHOD
+
+        // control module has an error
+        METHOD PUBLIC HasError : BOOL;
+            HasError := _hasError;
+        END_METHOD
+
+        METHOD PUBLIC GetErrorStatus : WORD
+            GetErrorStatus := _errorState;
+        END_METHOD
+
     END_CLASS
 
 END_NAMESPACE