Merge pull request #32 from simatic-ax/change_refactor_interfaces

Change refactor interfaces

Author: sjuergen

apax-lock.json

@@ -25,7 +25,7 @@ installStrategy: strict
 apaxVersion: 3.2.1
 # Dependencies
 devDependencies:
-  '@ax/sdk': 2411.0.0
+  '@ax/sdk': 2411.2.0
   # "@simatic-ax/mocks": 0.1.3 TEMPORARY DIABLED BEACUSE OF DISABLED MOCKING FUNCTIONALITY
   "@simatic-ax/snippetscollection": 1.0.0
 dependencies:

apax.yml

@@ -1,5 +1,5 @@
 NAMESPACE Simatic.Ax.IO.Input
-    CLASS BinSignal EXTENDS InputBase IMPLEMENTS IBinSignal
+    CLASS BinSignal EXTENDS InputBase IMPLEMENTS ItfBinSignal
         VAR PUBLIC
             invert : BOOL := FALSE;
         END_VAR

src/Input/BinSignal.st

@@ -0,0 +1,34 @@
+NAMESPACE Simatic.Ax.IO.Input
+
+    INTERFACE ItfBinSignal
+        METHOD Q : BOOL
+        END_METHOD
+        METHOD QRis : BOOL
+        END_METHOD
+        METHOD QFal : BOOL
+        END_METHOD
+        METHOD QBad : BOOL
+        END_METHOD
+    END_INTERFACE
+
+    CLASS NullBinSignal
+        IMPLEMENTS ItfBinSignal
+
+        METHOD PUBLIC Q : BOOL
+            ;
+        END_METHOD
+
+        METHOD PUBLIC QRis : BOOL
+            ;
+        END_METHOD
+
+        METHOD PUBLIC QFal : BOOL
+            ;
+        END_METHOD
+
+        METHOD PUBLIC QBad : BOOL
+            ;
+        END_METHOD
+    END_CLASS
+
+END_NAMESPACE

src/Input/IBinSignal.st

@@ -2,7 +2,7 @@ NAMESPACE Simatic.Ax.IO.Output
 
     /// Class BinOutput
     /// An OOP concept to handle digital outputs as a own object
-    CLASS BinOutput IMPLEMENTS IBinOutput         
+    CLASS BinOutput IMPLEMENTS ItfBinOutput         
         VAR
             _state : BOOL;  // internal status 
             _stateOld : BOOL := FALSE;

src/Input/ItfBinSignal.st

@@ -0,0 +1,46 @@
+NAMESPACE Simatic.Ax.IO.Output
+
+    INTERFACE ItfBinOutput
+        METHOD SetQ
+            VAR_INPUT
+                value : BOOL;
+            END_VAR
+        END_METHOD
+        METHOD SetOn
+        END_METHOD
+        METHOD SetOff
+        END_METHOD
+        METHOD Toggle
+        END_METHOD
+        METHOD IsOn : BOOL
+        END_METHOD
+    END_INTERFACE
+
+    CLASS NullBinOutput
+        IMPLEMENTS ItfBinOutput
+
+        METHOD PUBLIC SetQ
+            VAR_INPUT
+                value : BOOL;
+            END_VAR
+            ;
+        END_METHOD
+
+        METHOD PUBLIC SetOn
+            ;
+        END_METHOD
+
+        METHOD PUBLIC SetOff
+            ;
+        END_METHOD
+
+        METHOD PUBLIC Toggle
+            ;
+        END_METHOD
+
+        METHOD PUBLIC IsOn : BOOL
+            ;
+        END_METHOD
+    END_CLASS
+
+END_NAMESPACE