From 34b07c7f12587b9d5b91ca7738a24e67e11732e1 Mon Sep 17 00:00:00 2001
From: sjuergen <juergen.seidel@siemens.com>
Date: Tue, 14 Jan 2025 16:31:37 +0100
Subject: [PATCH] use interfaces

---
 .../3_calculator_current_volume/apax.yml      | 28 +++++++++++++++++++
 .../src/TankBase.st                           |  2 +-
 .../src/ValveBase.st                          |  2 +-
 .../4_inheritance_complex_valve/apax.yml      | 28 +++++++++++++++++++
 05_oop_in_st/exercises/solution/apax.yml      | 28 +++++++++++++++++++
 5 files changed, 86 insertions(+), 2 deletions(-)

diff --git a/05_oop_in_st/exercises/3_calculator_current_volume/apax.yml b/05_oop_in_st/exercises/3_calculator_current_volume/apax.yml
index e69de29..92d1b64 100644
--- a/05_oop_in_st/exercises/3_calculator_current_volume/apax.yml
+++ b/05_oop_in_st/exercises/3_calculator_current_volume/apax.yml
@@ -0,0 +1,28 @@
+# General information
+name: "oop1"
+version: 0.0.1
+type: lib
+keywords:
+  - library
+author: SIMATIC AX
+# Description will be displayed in the apax extension
+description: <Description for your library>
+# Targets to be compiled with 'apax build'
+targets:
+  - "1500"
+  - llvm
+# Install settings
+installStrategy: strict
+apaxVersion: 3.2.1
+# Dependencies
+devDependencies:
+  "@ax/sdk": 2411.0.0
+
+# Environment variables
+variables:
+  APAX_BUILD_ARGS:
+    - "--debug" # Generate debug information for target "1500"
+
+# Files, which will be shipped with the library
+files:
+  - bin
diff --git a/05_oop_in_st/exercises/3_calculator_current_volume/src/TankBase.st b/05_oop_in_st/exercises/3_calculator_current_volume/src/TankBase.st
index 6d7584f..c0420b1 100644
--- a/05_oop_in_st/exercises/3_calculator_current_volume/src/TankBase.st
+++ b/05_oop_in_st/exercises/3_calculator_current_volume/src/TankBase.st
@@ -2,7 +2,7 @@
 
 NAMESPACE FluidHandlingClass   
 
-    CLASS TankBase
+    CLASS TankBase IMPLEMENTS ItfTank
         VAR PRIVATE
             inletValve: ValveBase;
             outletValve: ValveBase;
diff --git a/05_oop_in_st/exercises/3_calculator_current_volume/src/ValveBase.st b/05_oop_in_st/exercises/3_calculator_current_volume/src/ValveBase.st
index 0b22afc..dc3b099 100644
--- a/05_oop_in_st/exercises/3_calculator_current_volume/src/ValveBase.st
+++ b/05_oop_in_st/exercises/3_calculator_current_volume/src/ValveBase.st
@@ -2,7 +2,7 @@
 
 NAMESPACE FluidHandlingClass   
 
-    CLASS ValveBase
+    CLASS ValveBase IMPLEMENTS ItfValve
         VAR
             _ctrlOpen : BOOL;
             _state : ValveState;
diff --git a/05_oop_in_st/exercises/4_inheritance_complex_valve/apax.yml b/05_oop_in_st/exercises/4_inheritance_complex_valve/apax.yml
index e69de29..92d1b64 100644
--- a/05_oop_in_st/exercises/4_inheritance_complex_valve/apax.yml
+++ b/05_oop_in_st/exercises/4_inheritance_complex_valve/apax.yml
@@ -0,0 +1,28 @@
+# General information
+name: "oop1"
+version: 0.0.1
+type: lib
+keywords:
+  - library
+author: SIMATIC AX
+# Description will be displayed in the apax extension
+description: <Description for your library>
+# Targets to be compiled with 'apax build'
+targets:
+  - "1500"
+  - llvm
+# Install settings
+installStrategy: strict
+apaxVersion: 3.2.1
+# Dependencies
+devDependencies:
+  "@ax/sdk": 2411.0.0
+
+# Environment variables
+variables:
+  APAX_BUILD_ARGS:
+    - "--debug" # Generate debug information for target "1500"
+
+# Files, which will be shipped with the library
+files:
+  - bin
diff --git a/05_oop_in_st/exercises/solution/apax.yml b/05_oop_in_st/exercises/solution/apax.yml
index e69de29..92d1b64 100644
--- a/05_oop_in_st/exercises/solution/apax.yml
+++ b/05_oop_in_st/exercises/solution/apax.yml
@@ -0,0 +1,28 @@
+# General information
+name: "oop1"
+version: 0.0.1
+type: lib
+keywords:
+  - library
+author: SIMATIC AX
+# Description will be displayed in the apax extension
+description: <Description for your library>
+# Targets to be compiled with 'apax build'
+targets:
+  - "1500"
+  - llvm
+# Install settings
+installStrategy: strict
+apaxVersion: 3.2.1
+# Dependencies
+devDependencies:
+  "@ax/sdk": 2411.0.0
+
+# Environment variables
+variables:
+  APAX_BUILD_ARGS:
+    - "--debug" # Generate debug information for target "1500"
+
+# Files, which will be shipped with the library
+files:
+  - bin