From 5b0ef0ab367329fd82d710e2dfa552d31c55b5e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20H=C3=B6pfinger?= Date: Wed, 11 Dec 2024 07:53:12 +0100 Subject: [PATCH 1/4] Create Library --- data/typelibrary/adapterized-1.0.0/MANIFEST.MF | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 data/typelibrary/adapterized-1.0.0/MANIFEST.MF diff --git a/data/typelibrary/adapterized-1.0.0/MANIFEST.MF b/data/typelibrary/adapterized-1.0.0/MANIFEST.MF new file mode 100644 index 0000000000..e70bd06b5a --- /dev/null +++ b/data/typelibrary/adapterized-1.0.0/MANIFEST.MF @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file From 2b6ae249204ebd95c254d813d1a9cf565527ac1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20H=C3=B6pfinger?= Date: Wed, 11 Dec 2024 07:55:09 +0100 Subject: [PATCH 2/4] Add new AdapterType AX for 1 Event and 1 Bool Add new AdapterType AX for 1 Event and 1 Bool --- .../adapterized-1.0.0/typelib/adapter/AX.adp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 data/typelibrary/adapterized-1.0.0/typelib/adapter/AX.adp diff --git a/data/typelibrary/adapterized-1.0.0/typelib/adapter/AX.adp b/data/typelibrary/adapterized-1.0.0/typelib/adapter/AX.adp new file mode 100644 index 0000000000..7312ff9ab7 --- /dev/null +++ b/data/typelibrary/adapterized-1.0.0/typelib/adapter/AX.adp @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + From e9a0dec02225f8bc6d6d4f059c280b52cf250de9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20H=C3=B6pfinger?= Date: Thu, 12 Dec 2024 07:41:56 +0100 Subject: [PATCH 3/4] IXA, QXA, AX_OR Add new IXa FBType with event and data connections. Add new FBType "QXA" for boolean output data with events, vars, and connections. Add boolean OR function blocks AX_OR_2, AX_OR_3, and AX_OR_4. Detailed XML descriptions for each block with input/output connections. --- .../typelib/boolean/AX_OR_2.fbt | 40 ++++++++++++ .../typelib/boolean/AX_OR_3.fbt | 35 +++++++++++ .../typelib/boolean/AX_OR_4.fbt | 38 +++++++++++ .../adapterized-1.0.0/typelib/io/IXA.fbt | 50 +++++++++++++++ .../adapterized-1.0.0/typelib/io/QXA.fbt | 63 +++++++++++++++++++ 5 files changed, 226 insertions(+) create mode 100644 data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_2.fbt create mode 100644 data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_3.fbt create mode 100644 data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_4.fbt create mode 100644 data/typelibrary/adapterized-1.0.0/typelib/io/IXA.fbt create mode 100644 data/typelibrary/adapterized-1.0.0/typelib/io/QXA.fbt diff --git a/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_2.fbt b/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_2.fbt new file mode 100644 index 0000000000..a8829917e0 --- /dev/null +++ b/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_2.fbt @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright (c) 2024 HR Agrartechnik GmbH   
+   
+This program and the accompanying materials are made    
+available under the terms of the Eclipse Public License 2.0    
+which is available at https://www.eclipse.org/legal/epl-2.0/    
+    
+SPDX-License-Identifier: EPL-2.0

+]]> + diff --git a/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_3.fbt b/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_3.fbt new file mode 100644 index 0000000000..a6a18cc0fb --- /dev/null +++ b/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_3.fbt @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_4.fbt b/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_4.fbt new file mode 100644 index 0000000000..0bce3c5098 --- /dev/null +++ b/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_4.fbt @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/typelibrary/adapterized-1.0.0/typelib/io/IXA.fbt b/data/typelibrary/adapterized-1.0.0/typelib/io/IXA.fbt new file mode 100644 index 0000000000..d18be6eaa7 --- /dev/null +++ b/data/typelibrary/adapterized-1.0.0/typelib/io/IXA.fbt @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/typelibrary/adapterized-1.0.0/typelib/io/QXA.fbt b/data/typelibrary/adapterized-1.0.0/typelib/io/QXA.fbt new file mode 100644 index 0000000000..b332276325 --- /dev/null +++ b/data/typelibrary/adapterized-1.0.0/typelib/io/QXA.fbt @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copyright (c) 2024 HR Agrartechnik GmbH   
+   
+This program and the accompanying materials are made    
+available under the terms of the Eclipse Public License 2.0    
+which is available at https://www.eclipse.org/legal/epl-2.0/    
+    
+SPDX-License-Identifier: EPL-2.0

+]]> + From bcad466fd725150c2681a684743d8af7c6fd3b37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20H=C3=B6pfinger?= Date: Sun, 16 Feb 2025 10:17:52 +0100 Subject: [PATCH 4/4] Update this concept, to be conform to https://github.com/eclipse-4diac/4diac-ide/discussions/1043 https://github.com/eclipse-4diac/4diac-ide/discussions/1043 --- .../adapterized-1.0.0/typelib/adapter/AX.adp | 19 ----------- .../typelib/adapter/bidirectional/AB2.adp | 27 +++++++++++++++ .../typelib/adapter/bidirectional/AE2.adp | 19 +++++++++++ .../typelib/adapter/bidirectional/AX2.adp | 27 +++++++++++++++ .../typelib/adapter/unidirectional/AB.adp | 19 +++++++++++ .../typelib/adapter/unidirectional/AE.adp | 15 ++++++++ .../typelib/adapter/unidirectional/AX.adp | 19 +++++++++++ .../typelib/boolean/AX_OR_2.fbt | 22 ++++++------ .../typelib/boolean/AX_OR_3.fbt | 26 +++++++------- .../typelib/boolean/AX_OR_4.fbt | 34 +++++++++---------- .../adapterized-1.0.0/typelib/io/IXA.fbt | 6 ++-- .../adapterized-1.0.0/typelib/io/QXA.fbt | 6 ++-- 12 files changed, 173 insertions(+), 66 deletions(-) delete mode 100644 data/typelibrary/adapterized-1.0.0/typelib/adapter/AX.adp create mode 100644 data/typelibrary/adapterized-1.0.0/typelib/adapter/bidirectional/AB2.adp create mode 100644 data/typelibrary/adapterized-1.0.0/typelib/adapter/bidirectional/AE2.adp create mode 100644 data/typelibrary/adapterized-1.0.0/typelib/adapter/bidirectional/AX2.adp create mode 100644 data/typelibrary/adapterized-1.0.0/typelib/adapter/unidirectional/AB.adp create mode 100644 data/typelibrary/adapterized-1.0.0/typelib/adapter/unidirectional/AE.adp create mode 100644 data/typelibrary/adapterized-1.0.0/typelib/adapter/unidirectional/AX.adp diff --git a/data/typelibrary/adapterized-1.0.0/typelib/adapter/AX.adp b/data/typelibrary/adapterized-1.0.0/typelib/adapter/AX.adp deleted file mode 100644 index 7312ff9ab7..0000000000 --- a/data/typelibrary/adapterized-1.0.0/typelib/adapter/AX.adp +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/data/typelibrary/adapterized-1.0.0/typelib/adapter/bidirectional/AB2.adp b/data/typelibrary/adapterized-1.0.0/typelib/adapter/bidirectional/AB2.adp new file mode 100644 index 0000000000..97bdb03ce8 --- /dev/null +++ b/data/typelibrary/adapterized-1.0.0/typelib/adapter/bidirectional/AB2.adp @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/typelibrary/adapterized-1.0.0/typelib/adapter/bidirectional/AE2.adp b/data/typelibrary/adapterized-1.0.0/typelib/adapter/bidirectional/AE2.adp new file mode 100644 index 0000000000..7b17fb92a9 --- /dev/null +++ b/data/typelibrary/adapterized-1.0.0/typelib/adapter/bidirectional/AE2.adp @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/data/typelibrary/adapterized-1.0.0/typelib/adapter/bidirectional/AX2.adp b/data/typelibrary/adapterized-1.0.0/typelib/adapter/bidirectional/AX2.adp new file mode 100644 index 0000000000..4223bf8d1c --- /dev/null +++ b/data/typelibrary/adapterized-1.0.0/typelib/adapter/bidirectional/AX2.adp @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/typelibrary/adapterized-1.0.0/typelib/adapter/unidirectional/AB.adp b/data/typelibrary/adapterized-1.0.0/typelib/adapter/unidirectional/AB.adp new file mode 100644 index 0000000000..9f60027727 --- /dev/null +++ b/data/typelibrary/adapterized-1.0.0/typelib/adapter/unidirectional/AB.adp @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/data/typelibrary/adapterized-1.0.0/typelib/adapter/unidirectional/AE.adp b/data/typelibrary/adapterized-1.0.0/typelib/adapter/unidirectional/AE.adp new file mode 100644 index 0000000000..44783bf940 --- /dev/null +++ b/data/typelibrary/adapterized-1.0.0/typelib/adapter/unidirectional/AE.adp @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/data/typelibrary/adapterized-1.0.0/typelib/adapter/unidirectional/AX.adp b/data/typelibrary/adapterized-1.0.0/typelib/adapter/unidirectional/AX.adp new file mode 100644 index 0000000000..7317981c0f --- /dev/null +++ b/data/typelibrary/adapterized-1.0.0/typelib/adapter/unidirectional/AX.adp @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_2.fbt b/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_2.fbt index a8829917e0..636b43613d 100644 --- a/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_2.fbt +++ b/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_2.fbt @@ -1,31 +1,31 @@ - + - + - + - + - - + + - + - - + + - - + + diff --git a/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_3.fbt b/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_3.fbt index a6a18cc0fb..4a9bb7baaf 100644 --- a/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_3.fbt +++ b/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_3.fbt @@ -1,35 +1,35 @@ - + - + - + - + - - - + + + - + - + - + - - + + - + diff --git a/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_4.fbt b/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_4.fbt index 0bce3c5098..dcd2491404 100644 --- a/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_4.fbt +++ b/data/typelibrary/adapterized-1.0.0/typelib/boolean/AX_OR_4.fbt @@ -1,38 +1,38 @@ - + - + - + - + - - - - + + + + - + - - + + - - + + - - + + - - + + diff --git a/data/typelibrary/adapterized-1.0.0/typelib/io/IXA.fbt b/data/typelibrary/adapterized-1.0.0/typelib/io/IXA.fbt index d18be6eaa7..291eec7ed0 100644 --- a/data/typelibrary/adapterized-1.0.0/typelib/io/IXA.fbt +++ b/data/typelibrary/adapterized-1.0.0/typelib/io/IXA.fbt @@ -1,8 +1,8 @@ - + - + @@ -28,7 +28,7 @@ - + diff --git a/data/typelibrary/adapterized-1.0.0/typelib/io/QXA.fbt b/data/typelibrary/adapterized-1.0.0/typelib/io/QXA.fbt index b332276325..e4789d2509 100644 --- a/data/typelibrary/adapterized-1.0.0/typelib/io/QXA.fbt +++ b/data/typelibrary/adapterized-1.0.0/typelib/io/QXA.fbt @@ -1,8 +1,8 @@ - + - + @@ -32,7 +32,7 @@ - +