From abb676b70be4295aea994230a51f8657f2a74270 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Mon, 15 Jul 2024 16:58:57 +0200 Subject: [PATCH 01/21] Delete Product version from all files --- solution/tc_project_app/GVLs/GVL_APP.TcGVL | 2 +- solution/tc_project_app/GlobalTextList.TcGTLO | 2 +- .../Applications/Application_Template.TcPOU | 2 +- .../Axes/Axis_Template.TcPOU | 2 +- .../Axes/Pneumatics_Template.TcPOU | 2 +- solution/tc_project_app/POUs/MAIN.TcPOU | 2 +- solution/tc_project_app/PlcTask.TcTTO | 2 +- .../Visualization Manager.TcVMO | 62 +++++++++---------- .../tc_project_app/tc_project_app.plcproj | 26 ++++---- 9 files changed, 51 insertions(+), 51 deletions(-) diff --git a/solution/tc_project_app/GVLs/GVL_APP.TcGVL b/solution/tc_project_app/GVLs/GVL_APP.TcGVL index 1f59157..17eaa46 100644 --- a/solution/tc_project_app/GVLs/GVL_APP.TcGVL +++ b/solution/tc_project_app/GVLs/GVL_APP.TcGVL @@ -1,5 +1,5 @@  - + - + diff --git a/solution/tc_project_app/POUs/Application_Specific/Applications/Application_Template.TcPOU b/solution/tc_project_app/POUs/Application_Specific/Applications/Application_Template.TcPOU index d1201aa..78425b1 100644 --- a/solution/tc_project_app/POUs/Application_Specific/Applications/Application_Template.TcPOU +++ b/solution/tc_project_app/POUs/Application_Specific/Applications/Application_Template.TcPOU @@ -1,5 +1,5 @@  - + - + - + - + - + 10000 diff --git a/solution/tc_project_app/Visualization Manager.TcVMO b/solution/tc_project_app/Visualization Manager.TcVMO index 516c2d1..c162438 100644 --- a/solution/tc_project_app/Visualization Manager.TcVMO +++ b/solution/tc_project_app/Visualization Manager.TcVMO @@ -1,5 +1,5 @@  - + @@ -43,12 +43,12 @@ + FB_Exit + 0be1b9ab-e8eb-4b33-b803-109abb46bde4 FB_Init c98701bd-1e9f-450a-a2a8-a2474d536f2e FB_Reinit 5b6e372a-a69d-40e8-aef7-f470b7c53d95 - FB_Exit - 0be1b9ab-e8eb-4b33-b803-109abb46bde4 "NotImportant" {aa8b7e42-e967-427f-8f2e-f00f9d706470} @@ -464,42 +464,42 @@ - ExecuteLooseCapture - 4e2884cd-dc97-4120-914c-87a83e618f1f - ExecuteMouseUp - 57eea9a5-15d9-4269-bb8d-9fee5420cdb2 - Init - e61a0910-39b6-4bcc-9a64-fcab62230628 - FB_Exit - e6e1ea47-0811-4b03-9888-d0564361e0d6 - ExecuteMouseDblClick - a517a0ac-170b-4df4-b289-55dcb57628ed - GetElementInfo - f64cb89f-3016-4fba-85f5-02efcd4282c1 - ExecuteMouseDown - 94bab392-b395-4c03-9d0e-5738d11bd021 - FB_Reinit - 97933c03-0169-4afe-ac83-de892204e120 - Initialize - 6946d6e0-129f-4425-b8b0-ef98281a99e9 - ExecuteMouseMove - 58fc221c-be14-4e34-871e-a118f8ba9539 - ExecuteDialogClosed - f08d08b6-e70c-4bef-a136-38845bd246d8 - ExecuteKeyUp - 7403635b-2725-4f00-93d4-e0dd125959de - ExecuteKeyDown - 9649ecda-3794-4d6b-a8a7-71e528d9d170 abstrGetDefaultCursor 25718998-50a9-408d-8b3f-20a55e2cc784 + ExecuteDialogClosed + f08d08b6-e70c-4bef-a136-38845bd246d8 + ExecuteKeyDown + 9649ecda-3794-4d6b-a8a7-71e528d9d170 + ExecuteKeyUp + 7403635b-2725-4f00-93d4-e0dd125959de + ExecuteLooseCapture + 4e2884cd-dc97-4120-914c-87a83e618f1f + ExecuteMouseClick + cd348bda-7eaf-4dfe-8c4b-bf9b71e5b10c + ExecuteMouseDblClick + a517a0ac-170b-4df4-b289-55dcb57628ed + ExecuteMouseDown + 94bab392-b395-4c03-9d0e-5738d11bd021 ExecuteMouseEnter 569205fa-533b-4fc2-8d51-21ccab693305 ExecuteMouseLeave 3bacea68-55b4-4764-928e-e69910299932 + ExecuteMouseMove + 58fc221c-be14-4e34-871e-a118f8ba9539 + ExecuteMouseUp + 57eea9a5-15d9-4269-bb8d-9fee5420cdb2 + FB_Exit + e6e1ea47-0811-4b03-9888-d0564361e0d6 FB_Init f37e1250-9b48-45ca-810e-c192ea9440ec - ExecuteMouseClick - cd348bda-7eaf-4dfe-8c4b-bf9b71e5b10c + FB_Reinit + 97933c03-0169-4afe-ac83-de892204e120 + GetElementInfo + f64cb89f-3016-4fba-85f5-02efcd4282c1 + Init + e61a0910-39b6-4bcc-9a64-fcab62230628 + Initialize + 6946d6e0-129f-4425-b8b0-ef98281a99e9 "NotImportant" {073ee466-cf0a-4c8b-ba92-64f671516699} diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index b8d1462..b56e613 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -16,7 +16,7 @@ false - true + false false true @@ -445,8 +445,8 @@ - - + + "<ProjectRoot>" {192FAD59-8248-4824-A8DE-9177C94C195A} @@ -516,16 +516,16 @@ - - - System.Boolean - System.Collections.Hashtable - System.Int32 - {af9bafe2-ba31-4b15-a2b9-48a0f2cd09fb} - {54dd0eac-a6d8-46f2-8c27-2f43c7e49861} - System.String - - + + + System.Boolean + System.Collections.Hashtable + System.Int32 + {af9bafe2-ba31-4b15-a2b9-48a0f2cd09fb} + {54dd0eac-a6d8-46f2-8c27-2f43c7e49861} + System.String + + \ No newline at end of file From 7ab40ac3db8e49d0c7c906bfbabd9a0bf7aae2c8 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Mon, 15 Jul 2024 16:59:38 +0200 Subject: [PATCH 02/21] Comment the pipeline call of twincat_version_manager.py --- bitbucket-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 3412348..6869155 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -6,8 +6,8 @@ pipelines: - step: script: - git submodule update --init - - python twincat_version_manager.py - python check_fix_white_space.py - ./check_no_lineids.sh - ./check_code_before_sq_brackets.sh + #- python twincat_version_manager.py From 2eec180723693052b99595f36d799d8f5f915927 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Mon, 15 Jul 2024 17:00:32 +0200 Subject: [PATCH 03/21] Update pointer of tc_mca_lib to commit 9d09ac --- solution/tc_project_app/tc_mca_std_lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib index a44a596..ff29033 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit a44a59664c0a8f855c0909b8e758e71c676d3c56 +Subproject commit ff29033a16fa00b26ad0abb6665870397c9d09ac From 0209184644e67bc8152166d1af9ce889789be325 Mon Sep 17 00:00:00 2001 From: kristinajurisic Date: Tue, 16 Jul 2024 14:52:35 +0200 Subject: [PATCH 04/21] Add commented variables to the Pneumatics_Template(PRG), as a template for pneumatic axis setup. --- solution/tc_project_app/GlobalTextList.TcGTLO | 52 ++++++++++++++++++- .../Axes/Pneumatics_Template.TcPOU | 17 ++++-- solution/tc_project_app/tc_mca_std_lib | 2 +- 3 files changed, 66 insertions(+), 5 deletions(-) diff --git a/solution/tc_project_app/GlobalTextList.TcGTLO b/solution/tc_project_app/GlobalTextList.TcGTLO index ab865a8..1cc9f40 100644 --- a/solution/tc_project_app/GlobalTextList.TcGTLO +++ b/solution/tc_project_app/GlobalTextList.TcGTLO @@ -1,5 +1,5 @@  - + @@ -25,6 +25,11 @@ "%2.2f" + + "17" + "%2.3f" + + "543" "%2.4f" @@ -65,6 +70,11 @@ "actVel" + + "414" + "Allowed pressure out of range time(s)" + + "110" "AXESMAX" @@ -215,6 +225,11 @@ "Bwd Enable" + + "974" + "Current pressure value (bar)" + + "986" "ehomeDirect" @@ -280,6 +295,11 @@ "Elapsed time" + + "87" + "Elapsed time (ms)" + + "104" "ENABLE" @@ -295,6 +315,21 @@ "ENABLE FW" + + "1009" + "End switches simulation" + + + + "554" + "EndSwitchBwd" + + + + "1084" + "EndSwitchFwd" + + "109" "English" @@ -415,6 +450,11 @@ "halt" + + "347" + "High pressure limit (bar)" + + "123" "HOME" @@ -460,6 +500,11 @@ "jogFw" + + "1195" + "Label" + + "19" "Limit switches simulation" @@ -475,6 +520,11 @@ "LimitFwd" + + "961" + "Low pressure limit (bar)" + + "298" "masterGear" diff --git a/solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU b/solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU index d374ed2..bf37763 100644 --- a/solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU +++ b/solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU @@ -1,13 +1,24 @@  - + - Date: Tue, 16 Jul 2024 15:03:19 +0200 Subject: [PATCH 05/21] Add Shutter Operator panel Template, to define the behavior of the LEDs on the panel. --- solution/_Config/PLC/tc_project_app.xti | 2 +- .../tc_project_app/tc_project_app.plcproj | 27 ++++++++++--------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/solution/_Config/PLC/tc_project_app.xti b/solution/_Config/PLC/tc_project_app.xti index dee3b3f..eb7bdb2 100644 --- a/solution/_Config/PLC/tc_project_app.xti +++ b/solution/_Config/PLC/tc_project_app.xti @@ -1,7 +1,7 @@ - + tc_project_app Instance {08500001-0000-0000-F000-000000000064} diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index 4820150..d6e3ca9 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -37,6 +37,9 @@ Code + + Code + Code @@ -448,8 +451,8 @@ - - + + "<ProjectRoot>" {192FAD59-8248-4824-A8DE-9177C94C195A} @@ -519,16 +522,16 @@ - - - System.Boolean - System.Collections.Hashtable - System.Int32 - {af9bafe2-ba31-4b15-a2b9-48a0f2cd09fb} - {54dd0eac-a6d8-46f2-8c27-2f43c7e49861} - System.String - - + + + System.Boolean + System.Collections.Hashtable + System.Int32 + {af9bafe2-ba31-4b15-a2b9-48a0f2cd09fb} + {54dd0eac-a6d8-46f2-8c27-2f43c7e49861} + System.String + + \ No newline at end of file From 0466b813d1e994ecea0fae8fa842b3b65b88d428 Mon Sep 17 00:00:00 2001 From: kristinajurisic Date: Tue, 16 Jul 2024 15:09:05 +0200 Subject: [PATCH 06/21] Update comment on the code implementation in the template. --- .../Shutter_Operator_panel_Template.TcPOU | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU diff --git a/solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU b/solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU new file mode 100644 index 0000000..1020451 --- /dev/null +++ b/solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU @@ -0,0 +1,41 @@ + + + + + + + + + \ No newline at end of file From b8132f82e98de363d1b9332f133048de376fe4fc Mon Sep 17 00:00:00 2001 From: kristinajurisic Date: Tue, 16 Jul 2024 15:11:58 +0200 Subject: [PATCH 07/21] Add changes after the filter run. --- .../Shutter_Operator_panel_Template.TcPOU | 21 ++++++++++--------- .../Axes/Pneumatics_Template.TcPOU | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU b/solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU index 1020451..93bc9e8 100644 --- a/solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU +++ b/solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU @@ -3,13 +3,13 @@ @@ -17,11 +17,11 @@ END_VAR //Assign LED to the permit status (*IF gvl.astPneumaticAxes[main.hmiPneumaticAxisSelection].stPneumaticAxisConfig.bPSSPneumaticAxisShutter THEN - bNoPermitLight := NOT gvl.astPneumaticAxes[main.hmiPneumaticAxisSelection].stPneumaticAxisInputs.bPSSPermit; - ELSE - bNoPermitLight := FALSE; - END_IF - + bNoPermitLight := NOT gvl.astPneumaticAxes[main.hmiPneumaticAxisSelection].stPneumaticAxisInputs.bPSSPermit; + ELSE + bNoPermitLight := FALSE; + END_IF + //Assign LED to the error status bErrorLight := gvl.astPneumaticAxes[main.hmiPneumaticAxisSelection].stPneumaticAxisStatus.bError; @@ -34,8 +34,9 @@ IF gvl.astPneumaticAxes[main.hmiPneumaticAxisSelection].stPneumaticAxisStatus.bR bMovingLight := TRUE; ELSE bMovingLight := FALSE; - END_IF -*)]]> + END_IF +*) +]]> \ No newline at end of file diff --git a/solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU b/solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU index bf37763..f887080 100644 --- a/solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU +++ b/solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU @@ -3,7 +3,7 @@ From 2e51f4e8c5980774709a3661f988d0f39d5f59f5 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Tue, 16 Jul 2024 15:23:42 +0200 Subject: [PATCH 08/21] Update pointer to tc_mca_Std_lib v2.5.0 and build solution --- solution/_Config/PLC/tc_project_app.xti | 2 +- solution/tc_project_app/tc_mca_std_lib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/solution/_Config/PLC/tc_project_app.xti b/solution/_Config/PLC/tc_project_app.xti index dee3b3f..efb25b2 100644 --- a/solution/_Config/PLC/tc_project_app.xti +++ b/solution/_Config/PLC/tc_project_app.xti @@ -1,7 +1,7 @@ - + tc_project_app Instance {08500001-0000-0000-F000-000000000064} diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib index ff29033..c46e99b 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit ff29033a16fa00b26ad0abb6665870397c9d09ac +Subproject commit c46e99b7beb0e817b0ae762b2108fa08ad2a603b From 622db493b3a04a35df450c9c9a4a8369f03c2555 Mon Sep 17 00:00:00 2001 From: kristinajurisic Date: Wed, 17 Jul 2024 08:38:51 +0200 Subject: [PATCH 09/21] Add comment to define user variables in the Pneumatics_Template(PRG). --- .../POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU b/solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU index f887080..6c63f9c 100644 --- a/solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU +++ b/solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU @@ -3,7 +3,7 @@ From a10e590af454b9c11b96e09185ce204127d09e44 Mon Sep 17 00:00:00 2001 From: kristinajurisic Date: Wed, 17 Jul 2024 10:27:39 +0200 Subject: [PATCH 10/21] Remove Product version line from the files. --- solution/tc_project_app/DUTs/E_CPUType.TcDUT | 2 +- solution/tc_project_app/GVLs/GVL_APP.TcGVL | 2 +- solution/tc_project_app/GlobalTextList.TcGTLO | 2 +- .../Applications/Application_Template.TcPOU | 2 +- .../Shutter_Operator_panel_Template.TcPOU | 2 +- .../Axes/Axis_Template.TcPOU | 2 +- .../Axes/Pneumatics_Template.TcPOU | 2 +- solution/tc_project_app/POUs/MAIN.TcPOU | 2 +- solution/tc_project_app/PlcTask.TcTTO | 2 +- .../Visualization Manager.TcVMO | 62 +++++++++---------- .../tc_project_app/tc_project_app.plcproj | 2 +- 11 files changed, 41 insertions(+), 41 deletions(-) diff --git a/solution/tc_project_app/DUTs/E_CPUType.TcDUT b/solution/tc_project_app/DUTs/E_CPUType.TcDUT index 7ca656f..23f0f1a 100644 --- a/solution/tc_project_app/DUTs/E_CPUType.TcDUT +++ b/solution/tc_project_app/DUTs/E_CPUType.TcDUT @@ -1,5 +1,5 @@  - + - + - + diff --git a/solution/tc_project_app/POUs/Application_Specific/Applications/Application_Template.TcPOU b/solution/tc_project_app/POUs/Application_Specific/Applications/Application_Template.TcPOU index d1201aa..78425b1 100644 --- a/solution/tc_project_app/POUs/Application_Specific/Applications/Application_Template.TcPOU +++ b/solution/tc_project_app/POUs/Application_Specific/Applications/Application_Template.TcPOU @@ -1,5 +1,5 @@  - + - + - + - + - + - + 10000 diff --git a/solution/tc_project_app/Visualization Manager.TcVMO b/solution/tc_project_app/Visualization Manager.TcVMO index 516c2d1..c162438 100644 --- a/solution/tc_project_app/Visualization Manager.TcVMO +++ b/solution/tc_project_app/Visualization Manager.TcVMO @@ -1,5 +1,5 @@  - + @@ -43,12 +43,12 @@ + FB_Exit + 0be1b9ab-e8eb-4b33-b803-109abb46bde4 FB_Init c98701bd-1e9f-450a-a2a8-a2474d536f2e FB_Reinit 5b6e372a-a69d-40e8-aef7-f470b7c53d95 - FB_Exit - 0be1b9ab-e8eb-4b33-b803-109abb46bde4 "NotImportant" {aa8b7e42-e967-427f-8f2e-f00f9d706470} @@ -464,42 +464,42 @@ - ExecuteLooseCapture - 4e2884cd-dc97-4120-914c-87a83e618f1f - ExecuteMouseUp - 57eea9a5-15d9-4269-bb8d-9fee5420cdb2 - Init - e61a0910-39b6-4bcc-9a64-fcab62230628 - FB_Exit - e6e1ea47-0811-4b03-9888-d0564361e0d6 - ExecuteMouseDblClick - a517a0ac-170b-4df4-b289-55dcb57628ed - GetElementInfo - f64cb89f-3016-4fba-85f5-02efcd4282c1 - ExecuteMouseDown - 94bab392-b395-4c03-9d0e-5738d11bd021 - FB_Reinit - 97933c03-0169-4afe-ac83-de892204e120 - Initialize - 6946d6e0-129f-4425-b8b0-ef98281a99e9 - ExecuteMouseMove - 58fc221c-be14-4e34-871e-a118f8ba9539 - ExecuteDialogClosed - f08d08b6-e70c-4bef-a136-38845bd246d8 - ExecuteKeyUp - 7403635b-2725-4f00-93d4-e0dd125959de - ExecuteKeyDown - 9649ecda-3794-4d6b-a8a7-71e528d9d170 abstrGetDefaultCursor 25718998-50a9-408d-8b3f-20a55e2cc784 + ExecuteDialogClosed + f08d08b6-e70c-4bef-a136-38845bd246d8 + ExecuteKeyDown + 9649ecda-3794-4d6b-a8a7-71e528d9d170 + ExecuteKeyUp + 7403635b-2725-4f00-93d4-e0dd125959de + ExecuteLooseCapture + 4e2884cd-dc97-4120-914c-87a83e618f1f + ExecuteMouseClick + cd348bda-7eaf-4dfe-8c4b-bf9b71e5b10c + ExecuteMouseDblClick + a517a0ac-170b-4df4-b289-55dcb57628ed + ExecuteMouseDown + 94bab392-b395-4c03-9d0e-5738d11bd021 ExecuteMouseEnter 569205fa-533b-4fc2-8d51-21ccab693305 ExecuteMouseLeave 3bacea68-55b4-4764-928e-e69910299932 + ExecuteMouseMove + 58fc221c-be14-4e34-871e-a118f8ba9539 + ExecuteMouseUp + 57eea9a5-15d9-4269-bb8d-9fee5420cdb2 + FB_Exit + e6e1ea47-0811-4b03-9888-d0564361e0d6 FB_Init f37e1250-9b48-45ca-810e-c192ea9440ec - ExecuteMouseClick - cd348bda-7eaf-4dfe-8c4b-bf9b71e5b10c + FB_Reinit + 97933c03-0169-4afe-ac83-de892204e120 + GetElementInfo + f64cb89f-3016-4fba-85f5-02efcd4282c1 + Init + e61a0910-39b6-4bcc-9a64-fcab62230628 + Initialize + 6946d6e0-129f-4425-b8b0-ef98281a99e9 "NotImportant" {073ee466-cf0a-4c8b-ba92-64f671516699} diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index d6e3ca9..c77b28a 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -16,7 +16,7 @@ false - true + false false true From 536717c9461c31b249bae626e4fc3f38bdaded2a Mon Sep 17 00:00:00 2001 From: kristinajurisic Date: Wed, 17 Jul 2024 10:48:26 +0200 Subject: [PATCH 11/21] Update pointer to the tc_mca_std_lib v2.5.0. --- solution/tc_project_app/tc_mca_std_lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib index 54fd1ff..c46e99b 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit 54fd1ffe047e6b33cf9389bc8be44566c0f06218 +Subproject commit c46e99b7beb0e817b0ae762b2108fa08ad2a603b From 8ebe255569e66732663ff8866969a0623a8ac028 Mon Sep 17 00:00:00 2001 From: kristinajurisic Date: Wed, 17 Jul 2024 11:51:43 +0200 Subject: [PATCH 12/21] Remove conditions in the Shutter_Operator_panel_Template. --- .../Shutter_Operator_panel_Template.TcPOU | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU b/solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU index d35b7eb..0cb6ad1 100644 --- a/solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU +++ b/solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU @@ -16,26 +16,19 @@ END_VAR From 1399869326fe01b0404e3508deb6e17bd798b88d Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Wed, 17 Jul 2024 11:59:34 +0200 Subject: [PATCH 13/21] Fix formatting of commented variables Delete the extra jum line. Change from lince comment to a block comment. Use x for the index of the array instead of the HMI variable. modified: solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU --- .../Shutter_Operator_panel_Template.TcPOU | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU b/solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU index 0cb6ad1..70706d6 100644 --- a/solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU +++ b/solution/tc_project_app/POUs/Application_Specific/Applications/Shutter_Operator_panel_Template.TcPOU @@ -13,22 +13,21 @@ VAR END_VAR ]]> - From 1cd240239a87671c673952a97f25d89a9063012f Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Wed, 17 Jul 2024 13:14:27 +0200 Subject: [PATCH 14/21] Add missing variables for initial configuration to axis template Delete the variabels related to PILS Add the variables and comment related to advacned homing Add the new variable bEnableStopWithAnyLimitSwitch modified: solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU --- .../Application_Specific/Axes/Axis_Template.TcPOU | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU b/solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU index 11f10fb..2e30374 100644 --- a/solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU +++ b/solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU @@ -14,23 +14,22 @@ END_VAR From 724e1f82fadb4964cc3a79bc9b185196eee2e840 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Fri, 19 Jul 2024 11:24:09 +0200 Subject: [PATCH 15/21] Update GlobalTextList to support new button in VISU Update GlobalTextList to support the new button bEnableStopWithAnyLimitSwitch in MAINVISU modified: solution/tc_project_app/GlobalTextList.TcGTLO --- solution/tc_project_app/GlobalTextList.TcGTLO | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/solution/tc_project_app/GlobalTextList.TcGTLO b/solution/tc_project_app/GlobalTextList.TcGTLO index b545e95..8b5dec5 100644 --- a/solution/tc_project_app/GlobalTextList.TcGTLO +++ b/solution/tc_project_app/GlobalTextList.TcGTLO @@ -115,6 +115,11 @@ "bEnabled" + + "394" + "bEnableStopWithAnyLS" + + "941" "bError" @@ -665,6 +670,11 @@ "stop" + + "978" + "Stop at any Limit Swtich" + + "108" "Test Language" From 176c6d1a14711cc8e5d87077c6a9b2cdd6d958f9 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Fri, 19 Jul 2024 11:25:51 +0200 Subject: [PATCH 16/21] Update pointer to tc_mca_std_lib v2.6.0 --- solution/tc_project_app/tc_mca_std_lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib index c46e99b..4a1ce00 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit c46e99b7beb0e817b0ae762b2108fa08ad2a603b +Subproject commit 4a1ce0017b759bf781e6295b48c4eadbae2572a4 From 5cf987dd60caccaa40153ed9aedacdfa010a7460 Mon Sep 17 00:00:00 2001 From: Markus Kristensson Date: Mon, 2 Sep 2024 11:54:00 +0200 Subject: [PATCH 17/21] Update pointer Updates pointer to include fix of MBP-292-Remove-warnings. --- solution/tc_project_app/tc_mca_std_lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib index 4a1ce00..b3473d9 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit 4a1ce0017b759bf781e6295b48c4eadbae2572a4 +Subproject commit b3473d99d314fb6fbc1f1ebc267d88d9a380e0d3 From 93585de489c4c58167de81dbe5265f592ab1fc10 Mon Sep 17 00:00:00 2001 From: Markus Kristensson Date: Tue, 10 Sep 2024 11:18:34 +0200 Subject: [PATCH 18/21] Use reference to Pneumatic Axes Restructure the call to the pneumatic axes according to FB_Axes: 1. Link the axis structure for the pneumatic axes by calling the new stPneumaticAxis property. 2. Execute the pneumatic axes. --- solution/tc_project_app/POUs/MAIN.TcPOU | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/solution/tc_project_app/POUs/MAIN.TcPOU b/solution/tc_project_app/POUs/MAIN.TcPOU index eb06b93..1686557 100644 --- a/solution/tc_project_app/POUs/MAIN.TcPOU +++ b/solution/tc_project_app/POUs/MAIN.TcPOU @@ -45,6 +45,10 @@ IF _TaskInfo[fbGetCurTaskIndex.index].FirstCycle THEN afbAxes[GVL.iAxis].stAxis REF= astAxes[GVL.iAxis]; aIAxes[GVL.iAxis] := afbAxes[GVL.iAxis]; END_FOR + + FOR GVL.iPneumaticAxis := 1 TO GVL_APP.nPNEUMATIC_AXIS_NUM DO + afbPneumaticAxes[GVL.iPneumaticAxis].stPneumaticAxis REF= astPneumaticAxes[GVL.iPneumaticAxis]; + END_FOR //Custom axis types defined and linked to aiAxes here //FB_CustomAxis extends FB_axis //fbCustomAxis.stAxis REF= astAxes[x]; @@ -58,7 +62,7 @@ END_FOR //Execute Pneumatic Axis logic FOR GVL.iPneumaticAxis := 1 TO GVL_APP.nPNEUMATIC_AXIS_NUM DO - afbPneumaticAxes[GVL.iPneumaticAxis](stPneumaticAxisStruct := GVL.astPneumaticAxes[GVL.iPneumaticAxis]); + afbPneumaticAxes[GVL.iPneumaticAxis](); END_FOR ]]> From 2670cfdf0400143d77bf7a2d92b83e82ed7031f9 Mon Sep 17 00:00:00 2001 From: kristinajurisic Date: Tue, 29 Oct 2024 11:51:12 +0100 Subject: [PATCH 19/21] Update pointer to commit 1e257aee8 in std_lib. --- solution/tc_project_app/tc_mca_std_lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib index b3473d9..1e257ae 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit b3473d99d314fb6fbc1f1ebc267d88d9a380e0d3 +Subproject commit 1e257aee8a527c489e6141bf3fa01f4445265d69 From 037f05420abc817789abc1e2286098df1206ba37 Mon Sep 17 00:00:00 2001 From: Ruben Martinez Date: Tue, 12 Nov 2024 19:51:38 +0100 Subject: [PATCH 20/21] backlash compensation configuration DUT --- solution/tc_project_app/tc_project_app.plcproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index c77b28a..913351a 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -73,6 +73,9 @@ Code + + Code + Code From d0f0db2abafc79f0fdb5294dc6465229ab4da3de Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Thu, 14 Nov 2024 14:20:44 +0100 Subject: [PATCH 21/21] Update pointer to tc_mca_std_lib to commit 602207e --- solution/tc_project_app/tc_mca_std_lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib index 1e257ae..602207e 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit 1e257aee8a527c489e6141bf3fa01f4445265d69 +Subproject commit 602207ef7811419b8a15290d4fd187a163f2a0e7