From ec12c20286ffad00090538d1ee2246ffefb30671 Mon Sep 17 00:00:00 2001 From: moritzortmeier1 Date: Mon, 1 Jul 2024 23:32:51 +0200 Subject: [PATCH 01/13] add splitting directory and BYTE_TO_BOOLS.fct under utils typelib --- .../typelib/splitting/BYTE_TO_BOOLS.fct | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 data/typelibrary/utils-1.0.0/typelib/splitting/BYTE_TO_BOOLS.fct diff --git a/data/typelibrary/utils-1.0.0/typelib/splitting/BYTE_TO_BOOLS.fct b/data/typelibrary/utils-1.0.0/typelib/splitting/BYTE_TO_BOOLS.fct new file mode 100644 index 0000000000..70c7477e03 --- /dev/null +++ b/data/typelibrary/utils-1.0.0/typelib/splitting/BYTE_TO_BOOLS.fct @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d6b14cf833501368ec27c88d4e9955b59065e2d7 Mon Sep 17 00:00:00 2001 From: moritzortmeier1 Date: Mon, 1 Jul 2024 23:38:56 +0200 Subject: [PATCH 02/13] added BYTE_TO_QUARTERS.fct in splitting directory --- .../typelib/splitting/BYTE_TO_QUARTERS.fct | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 data/typelibrary/utils-1.0.0/typelib/splitting/BYTE_TO_QUARTERS.fct diff --git a/data/typelibrary/utils-1.0.0/typelib/splitting/BYTE_TO_QUARTERS.fct b/data/typelibrary/utils-1.0.0/typelib/splitting/BYTE_TO_QUARTERS.fct new file mode 100644 index 0000000000..b8aca70048 --- /dev/null +++ b/data/typelibrary/utils-1.0.0/typelib/splitting/BYTE_TO_QUARTERS.fct @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 7aca5fc2fd39237d8b5ee22faba6f9956185a7f4 Mon Sep 17 00:00:00 2001 From: Moritz Ortmeier Date: Sun, 7 Jul 2024 23:52:25 +0200 Subject: [PATCH 03/13] rename BYTE_TO_BOOLS.fct --- .../{BYTE_TO_BOOLS.fct => SPLITTING_BYTE_TO_BOOLS.fct} | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) rename data/typelibrary/utils-1.0.0/typelib/splitting/{BYTE_TO_BOOLS.fct => SPLITTING_BYTE_TO_BOOLS.fct} (88%) diff --git a/data/typelibrary/utils-1.0.0/typelib/splitting/BYTE_TO_BOOLS.fct b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_TO_BOOLS.fct similarity index 88% rename from data/typelibrary/utils-1.0.0/typelib/splitting/BYTE_TO_BOOLS.fct rename to data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_TO_BOOLS.fct index 70c7477e03..b489e0a7fd 100644 --- a/data/typelibrary/utils-1.0.0/typelib/splitting/BYTE_TO_BOOLS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_TO_BOOLS.fct @@ -1,5 +1,5 @@ - + @@ -8,12 +8,13 @@ - + - + + @@ -28,6 +29,7 @@ + @@ -39,7 +41,7 @@ - Date: Sun, 7 Jul 2024 23:54:10 +0200 Subject: [PATCH 04/13] rename BYTE_TO_QUARTERS.fct --- ..._TO_QUARTERS.fct => SPLITTING_BYTE_TO_QUARTERS.fct} | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) rename data/typelibrary/utils-1.0.0/typelib/splitting/{BYTE_TO_QUARTERS.fct => SPLITTING_BYTE_TO_QUARTERS.fct} (86%) diff --git a/data/typelibrary/utils-1.0.0/typelib/splitting/BYTE_TO_QUARTERS.fct b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_TO_QUARTERS.fct similarity index 86% rename from data/typelibrary/utils-1.0.0/typelib/splitting/BYTE_TO_QUARTERS.fct rename to data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_TO_QUARTERS.fct index b8aca70048..129f3f4ace 100644 --- a/data/typelibrary/utils-1.0.0/typelib/splitting/BYTE_TO_QUARTERS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_TO_QUARTERS.fct @@ -1,5 +1,5 @@ - + @@ -8,12 +8,13 @@ - + - + + @@ -24,6 +25,7 @@ + @@ -31,7 +33,7 @@ - Date: Mon, 8 Jul 2024 21:47:05 +0200 Subject: [PATCH 05/13] keep comments in renamed files --- .../typelib/splitting/SPLITTING_BYTE_TO_BOOLS.fct | 6 ++---- .../typelib/splitting/SPLITTING_BYTE_TO_QUARTERS.fct | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_TO_BOOLS.fct b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_TO_BOOLS.fct index b489e0a7fd..be2716b31a 100644 --- a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_TO_BOOLS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_TO_BOOLS.fct @@ -8,13 +8,12 @@ - + - - + @@ -29,7 +28,6 @@ - diff --git a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_TO_QUARTERS.fct b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_TO_QUARTERS.fct index 129f3f4ace..ce41fa359f 100644 --- a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_TO_QUARTERS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_TO_QUARTERS.fct @@ -8,13 +8,12 @@ - + - - + @@ -25,7 +24,6 @@ - From ff75d981c6958b50675d73940e0c6ba1c38dc6aa Mon Sep 17 00:00:00 2001 From: Moritz Ortmeier Date: Tue, 9 Jul 2024 21:47:37 +0200 Subject: [PATCH 06/13] change _TO_ to _INTO_ --- ...ITTING_BYTE_TO_BOOLS.fct => SPLITTING_BYTE_INTO_BOOLS.fct} | 4 ++-- ..._BYTE_TO_QUARTERS.fct => SPLITTING_BYTE_INTO_QUARTERS.fct} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename data/typelibrary/utils-1.0.0/typelib/splitting/{SPLITTING_BYTE_TO_BOOLS.fct => SPLITTING_BYTE_INTO_BOOLS.fct} (95%) rename data/typelibrary/utils-1.0.0/typelib/splitting/{SPLITTING_BYTE_TO_QUARTERS.fct => SPLITTING_BYTE_INTO_QUARTERS.fct} (94%) diff --git a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_TO_BOOLS.fct b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_INTO_BOOLS.fct similarity index 95% rename from data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_TO_BOOLS.fct rename to data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_INTO_BOOLS.fct index be2716b31a..6cc6ebc626 100644 --- a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_TO_BOOLS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_INTO_BOOLS.fct @@ -1,5 +1,5 @@ - + @@ -39,7 +39,7 @@ - - + @@ -31,7 +31,7 @@ - Date: Tue, 9 Jul 2024 21:58:34 +0200 Subject: [PATCH 07/13] change SPLITTING to SPLIT --- ...PLITTING_BYTE_INTO_BOOLS.fct => SPLIT_BYTE_INTO_BOOLS.fct} | 4 ++-- ...NG_BYTE_INTO_QUARTERS.fct => SPLIT_BYTE_INTO_QUARTERS.fct} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename data/typelibrary/utils-1.0.0/typelib/splitting/{SPLITTING_BYTE_INTO_BOOLS.fct => SPLIT_BYTE_INTO_BOOLS.fct} (95%) rename data/typelibrary/utils-1.0.0/typelib/splitting/{SPLITTING_BYTE_INTO_QUARTERS.fct => SPLIT_BYTE_INTO_QUARTERS.fct} (94%) diff --git a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_INTO_BOOLS.fct b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct similarity index 95% rename from data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_INTO_BOOLS.fct rename to data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct index 6cc6ebc626..27e6fca87d 100644 --- a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLITTING_BYTE_INTO_BOOLS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct @@ -1,5 +1,5 @@ - + @@ -39,7 +39,7 @@ - - + @@ -31,7 +31,7 @@ - Date: Mon, 15 Jul 2024 20:24:07 +0200 Subject: [PATCH 08/13] function comment at the top and use bitwise access --- .../splitting/SPLIT_BYTE_INTO_BOOLS.fct | 18 +++++++++--------- .../splitting/SPLIT_BYTE_INTO_QUARTERS.fct | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct index 27e6fca87d..9d5b0cb857 100644 --- a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct @@ -40,6 +40,7 @@ diff --git a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct index d1ddae237b..15833a4388 100644 --- a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct @@ -32,6 +32,7 @@ Date: Wed, 17 Jul 2024 22:22:33 +0200 Subject: [PATCH 09/13] delete Var_input comment --- .../utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct | 4 ++-- .../typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct index 9d5b0cb857..e21d9e3ec8 100644 --- a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct @@ -25,7 +25,7 @@ - + @@ -43,7 +43,7 @@ (* this Function extracts the 8 BOOLS from a byte *) VAR_INPUT - IN : BYTE; // BYTE Input + IN : BYTE; END_VAR VAR_OUTPUT diff --git a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct index 15833a4388..a50128ed3d 100644 --- a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct @@ -21,7 +21,7 @@ - + @@ -35,7 +35,7 @@ (* this Function extracts the 4 QUARTER BYTE from a byte *) VAR_INPUT - IN : BYTE; // BYTE Input + IN : BYTE; END_VAR VAR_OUTPUT From 7fe4d7511abf8d1455a300e0559b4b8dd9995157 Mon Sep 17 00:00:00 2001 From: Moritz Ortmeier Date: Sun, 21 Jul 2024 22:47:23 +0200 Subject: [PATCH 10/13] description comment above FUNCTION --- .../utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct | 6 +++--- .../typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct index e21d9e3ec8..19a05faf37 100644 --- a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct @@ -1,5 +1,5 @@ - + @@ -39,8 +39,8 @@ - - + @@ -31,8 +31,8 @@ - Date: Wed, 24 Jul 2024 08:05:13 +0200 Subject: [PATCH 11/13] added quarterconst.gcf, changed SHFT to SHIFT --- .../typelib/const/quarterconst.gcf | 250 ++++++++++++++++++ .../splitting/SPLIT_BYTE_INTO_QUARTERS.fct | 14 +- 2 files changed, 258 insertions(+), 6 deletions(-) create mode 100644 data/typelibrary/utils-1.0.0/typelib/const/quarterconst.gcf diff --git a/data/typelibrary/utils-1.0.0/typelib/const/quarterconst.gcf b/data/typelibrary/utils-1.0.0/typelib/const/quarterconst.gcf new file mode 100644 index 0000000000..3dae4198c3 --- /dev/null +++ b/data/typelibrary/utils-1.0.0/typelib/const/quarterconst.gcf @@ -0,0 +1,250 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct index 5c22495e47..02b1cfbbf1 100644 --- a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct @@ -8,12 +8,13 @@ - + - + + @@ -24,6 +25,7 @@ + @@ -45,10 +47,10 @@ VAR_OUTPUT OUT_03 : BYTE; // QUARTER BYTE 03 END_VAR -OUT_00 := SHR(IN AND BYTE_QUARTER_00, SHFT_QUARTER_00); -OUT_01 := SHR(IN AND BYTE_QUARTER_01, SHFT_QUARTER_01); -OUT_02 := SHR(IN AND BYTE_QUARTER_02, SHFT_QUARTER_02); -OUT_03 := SHR(IN AND BYTE_QUARTER_03, SHFT_QUARTER_03); +OUT_00 := SHR(IN AND BYTE_QUARTER_00, SHIFT_QUARTER_00); +OUT_01 := SHR(IN AND BYTE_QUARTER_01, SHIFT_QUARTER_01); +OUT_02 := SHR(IN AND BYTE_QUARTER_02, SHIFT_QUARTER_02); +OUT_03 := SHR(IN AND BYTE_QUARTER_03, SHIFT_QUARTER_03); END_FUNCTION ]]> From 8d031c211ed350e3b17685175cb7d029dfdd8f3d Mon Sep 17 00:00:00 2001 From: Moritz Ortmeier Date: Wed, 24 Jul 2024 08:17:15 +0200 Subject: [PATCH 12/13] readd EventInputs/Outputs comments --- .../typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct index 02b1cfbbf1..f1cf742ec6 100644 --- a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct @@ -8,13 +8,12 @@ - + - - + @@ -25,7 +24,6 @@ - From 2d62f2aa1f1ef0298b16510532d583cbce2a6f5d Mon Sep 17 00:00:00 2001 From: Moritz Ortmeier Date: Wed, 24 Jul 2024 21:28:14 +0200 Subject: [PATCH 13/13] change OUT Variable to BIT and QUARTER_BYTE --- .../splitting/SPLIT_BYTE_INTO_BOOLS.fct | 64 +++++++++---------- .../splitting/SPLIT_BYTE_INTO_QUARTERS.fct | 32 +++++----- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct index 19a05faf37..7d1882dbc7 100644 --- a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_BOOLS.fct @@ -14,28 +14,28 @@ - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + @@ -47,24 +47,24 @@ VAR_INPUT END_VAR VAR_OUTPUT - OUT_00 : BOOL; // BIT 00 - OUT_01 : BOOL; // BIT 01 - OUT_02 : BOOL; // BIT 02 - OUT_03 : BOOL; // BIT 03 - OUT_04 : BOOL; // BIT 04 - OUT_05 : BOOL; // BIT 05 - OUT_06 : BOOL; // BIT 06 - OUT_07 : BOOL; // BIT 07 + BIT_00 : BOOL; + BIT_01 : BOOL; + BIT_02 : BOOL; + BIT_03 : BOOL; + BIT_04 : BOOL; + BIT_05 : BOOL; + BIT_06 : BOOL; + BIT_07 : BOOL; END_VAR -OUT_00 := IN.%X0; -OUT_01 := IN.%X1; -OUT_02 := IN.%X2; -OUT_03 := IN.%X3; -OUT_04 := IN.%X4; -OUT_05 := IN.%X5; -OUT_06 := IN.%X6; -OUT_07 := IN.%X7; +BIT_00 := IN.%X0; +BIT_01 := IN.%X1; +BIT_02 := IN.%X2; +BIT_03 := IN.%X3; +BIT_04 := IN.%X4; +BIT_05 := IN.%X5; +BIT_06 := IN.%X6; +BIT_07 := IN.%X7; END_FUNCTION ]]> diff --git a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct index f1cf742ec6..457a125262 100644 --- a/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/splitting/SPLIT_BYTE_INTO_QUARTERS.fct @@ -14,20 +14,20 @@ - - - - + + + + - - - - + + + + @@ -39,16 +39,16 @@ VAR_INPUT END_VAR VAR_OUTPUT - OUT_00 : BYTE; // QUARTER BYTE 00 - OUT_01 : BYTE; // QUARTER BYTE 01 - OUT_02 : BYTE; // QUARTER BYTE 02 - OUT_03 : BYTE; // QUARTER BYTE 03 + QUARTER_BYTE_00 : BYTE; + QUARTER_BYTE_01 : BYTE; + QUARTER_BYTE_02 : BYTE; + QUARTER_BYTE_03 : BYTE; END_VAR -OUT_00 := SHR(IN AND BYTE_QUARTER_00, SHIFT_QUARTER_00); -OUT_01 := SHR(IN AND BYTE_QUARTER_01, SHIFT_QUARTER_01); -OUT_02 := SHR(IN AND BYTE_QUARTER_02, SHIFT_QUARTER_02); -OUT_03 := SHR(IN AND BYTE_QUARTER_03, SHIFT_QUARTER_03); +QUARTER_BYTE_00 := SHR(IN AND BYTE_QUARTER_00, SHIFT_QUARTER_00); +QUARTER_BYTE_01 := SHR(IN AND BYTE_QUARTER_01, SHIFT_QUARTER_01); +QUARTER_BYTE_02 := SHR(IN AND BYTE_QUARTER_02, SHIFT_QUARTER_02); +QUARTER_BYTE_03 := SHR(IN AND BYTE_QUARTER_03, SHIFT_QUARTER_03); END_FUNCTION ]]>