From dd3044e305851fe91c13dbe01f5d52ffc8e99931 Mon Sep 17 00:00:00 2001 From: moritzortmeier1 Date: Mon, 1 Jul 2024 22:55:05 +0200 Subject: [PATCH 1/7] added WORDS_TO_DWORD.fct under assembling directory in utils typelib --- .../typelib/assembling/WORDS_TO_DWORD.fct | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 data/typelibrary/utils-1.0.0/typelib/assembling/WORDS_TO_DWORD.fct diff --git a/data/typelibrary/utils-1.0.0/typelib/assembling/WORDS_TO_DWORD.fct b/data/typelibrary/utils-1.0.0/typelib/assembling/WORDS_TO_DWORD.fct new file mode 100644 index 0000000000..80d7b9f75a --- /dev/null +++ b/data/typelibrary/utils-1.0.0/typelib/assembling/WORDS_TO_DWORD.fct @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 7ef7316196b4954baa2f3416c2b72af671250a33 Mon Sep 17 00:00:00 2001 From: Moritz Ortmeier Date: Sun, 7 Jul 2024 23:35:36 +0200 Subject: [PATCH 2/7] rename WORDS_TO_DWORD.fct --- .../{WORDS_TO_DWORD.fct => ASSEMBLE_DWORD_FROM_WORDS.fct} | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) rename data/typelibrary/utils-1.0.0/typelib/assembling/{WORDS_TO_DWORD.fct => ASSEMBLE_DWORD_FROM_WORDS.fct} (88%) diff --git a/data/typelibrary/utils-1.0.0/typelib/assembling/WORDS_TO_DWORD.fct b/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct similarity index 88% rename from data/typelibrary/utils-1.0.0/typelib/assembling/WORDS_TO_DWORD.fct rename to data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct index 80d7b9f75a..08de92afdc 100644 --- a/data/typelibrary/utils-1.0.0/typelib/assembling/WORDS_TO_DWORD.fct +++ b/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct @@ -1,5 +1,5 @@ - + @@ -15,6 +15,7 @@ + @@ -23,11 +24,12 @@ + - Date: Sun, 7 Jul 2024 23:39:30 +0200 Subject: [PATCH 3/7] use return instead of var_output for dword assembling --- .../assembling/ASSEMBLE_DWORD_FROM_WORDS.fct | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct b/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct index 08de92afdc..1f679cfb50 100644 --- a/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct @@ -16,7 +16,6 @@ - @@ -24,24 +23,22 @@ - - + - Date: Mon, 15 Jul 2024 19:44:49 +0200 Subject: [PATCH 4/7] change wordwise access to .%W0 --- .../typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct b/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct index 1f679cfb50..a9205fcf0d 100644 --- a/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct @@ -38,8 +38,8 @@ END_VAR // OUT : DWORD; // DWORD Output // END_VAR (* this Function combines the 2 WORDS to a dword *) -ASSEMBLE_DWORD_FROM_WORDS := SHL(WORD_TO_DWORD(IN_01), SHIFT_WORD_01) - OR SHL(WORD_TO_DWORD(IN_00), SHIFT_WORD_00); +ASSEMBLE_DWORD_FROM_WORDS.%W0 := IN_00; +ASSEMBLE_DWORD_FROM_WORDS.%W1 := IN_01; END_FUNCTION ]]> From a7aa32a208f9efc72764dad653a92ef01893937e Mon Sep 17 00:00:00 2001 From: Moritz Ortmeier Date: Wed, 17 Jul 2024 21:39:10 +0200 Subject: [PATCH 5/7] delete var_output, function description at the top --- .../typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct b/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct index a9205fcf0d..b69bc53f72 100644 --- a/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct @@ -28,16 +28,13 @@ Date: Sun, 21 Jul 2024 22:44:29 +0200 Subject: [PATCH 6/7] description comment above FUNCTION --- .../typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct b/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct index b69bc53f72..c888411834 100644 --- a/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct @@ -1,5 +1,5 @@ - + @@ -27,8 +27,8 @@ - Date: Sun, 28 Jul 2024 17:06:20 +0200 Subject: [PATCH 7/7] Change Input Variables IN_xx to WORD_xx --- .../assembling/ASSEMBLE_DWORD_FROM_WORDS.fct | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct b/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct index c888411834..2050b9de8d 100644 --- a/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct +++ b/data/typelibrary/utils-1.0.0/typelib/assembling/ASSEMBLE_DWORD_FROM_WORDS.fct @@ -9,8 +9,8 @@ - - + + @@ -19,8 +19,8 @@ - - + + @@ -31,12 +31,12 @@ FUNCTION ASSEMBLE_DWORD_FROM_WORDS : DWORD VAR_INPUT - IN_00 : WORD; // WORD 00 - IN_01 : WORD; // WORD 01 + WORD_00 : WORD; + WORD_01 : WORD; END_VAR -ASSEMBLE_DWORD_FROM_WORDS.%W0 := IN_00; -ASSEMBLE_DWORD_FROM_WORDS.%W1 := IN_01; +ASSEMBLE_DWORD_FROM_WORDS.%W0 := WORD_00; +ASSEMBLE_DWORD_FROM_WORDS.%W1 := WORD_01; END_FUNCTION ]]>