From d2ca3c9ec93072ed94eb99438386032570a5fefe Mon Sep 17 00:00:00 2001 From: Israa Ali Date: Tue, 3 Dec 2024 10:02:50 +0100 Subject: [PATCH 1/5] Improved and added some comments --- solution/tc_project_app/GVLs/GVL_APP.TcGVL | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/solution/tc_project_app/GVLs/GVL_APP.TcGVL b/solution/tc_project_app/GVLs/GVL_APP.TcGVL index dd677f0..88ea1a4 100644 --- a/solution/tc_project_app/GVLs/GVL_APP.TcGVL +++ b/solution/tc_project_app/GVLs/GVL_APP.TcGVL @@ -3,13 +3,13 @@ From dd25c6f384129c33915064db1df10d6991d207d6 Mon Sep 17 00:00:00 2001 From: Israa Ali Date: Wed, 4 Dec 2024 12:17:33 +0100 Subject: [PATCH 2/5] Edit comments in MAIN and update std_lib pointer modified: solution/tc_project_app/POUs/MAIN.TcPOU modified: solution/tc_project_app/tc_mca_std_lib --- solution/tc_project_app/GVLs/GVL_APP.TcGVL | 2 +- solution/tc_project_app/POUs/MAIN.TcPOU | 14 ++++++++------ solution/tc_project_app/tc_mca_std_lib | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/solution/tc_project_app/GVLs/GVL_APP.TcGVL b/solution/tc_project_app/GVLs/GVL_APP.TcGVL index 88ea1a4..e788366 100644 --- a/solution/tc_project_app/GVLs/GVL_APP.TcGVL +++ b/solution/tc_project_app/GVLs/GVL_APP.TcGVL @@ -8,7 +8,7 @@ VAR_GLOBAL END_VAR VAR_GLOBAL CONSTANT - nAXIS_NUM: UINT := 0; //Specifies the total of axes in the system + nAXIS_NUM: UINT := 0; //Specifies the total of axes in the system nPNEUMATIC_AXIS_NUM: UINT := 0; //Specifies the totsl number pf pneumatic axes in the system END_VAR ]]> diff --git a/solution/tc_project_app/POUs/MAIN.TcPOU b/solution/tc_project_app/POUs/MAIN.TcPOU index 1686557..15d49f0 100644 --- a/solution/tc_project_app/POUs/MAIN.TcPOU +++ b/solution/tc_project_app/POUs/MAIN.TcPOU @@ -45,7 +45,7 @@ IF _TaskInfo[fbGetCurTaskIndex.index].FirstCycle THEN afbAxes[GVL.iAxis].stAxis REF= astAxes[GVL.iAxis]; aIAxes[GVL.iAxis] := afbAxes[GVL.iAxis]; END_FOR - + //Initialize pneumatic axes and link them to their corresponding instances FOR GVL.iPneumaticAxis := 1 TO GVL_APP.nPNEUMATIC_AXIS_NUM DO afbPneumaticAxes[GVL.iPneumaticAxis].stPneumaticAxis REF= astPneumaticAxes[GVL.iPneumaticAxis]; END_FOR @@ -71,14 +71,16 @@ END_FOR eSUPS_PowerOK THEN - //next cycles of powerfailure - //skip regular code execution for the remaining cycles of the powerfailure/writing of persistent data/quick shutdown... + //Next cycles of powerfailure + //Skip regular code execution for the remaining cycles of the powerfailure/writing of persistent data/quick shutdown... RETURN; END_IF ]]> diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib index 602207e..27a93cd 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit 602207ef7811419b8a15290d4fd187a163f2a0e7 +Subproject commit 27a93cd6a0bb13b48be2c5161c5d8b19d2ff5126 From b7153af4d7b532416380644ae92cb635247fa459 Mon Sep 17 00:00:00 2001 From: federicorojas Date: Tue, 14 Jan 2025 13:39:17 +0100 Subject: [PATCH 3/5] Build solution without bJog commands bJog commands does not exist anymore in tc_mca_Std_lib. Build the solution with those changes in std_lib --- 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 efb25b2..ecaa2b6 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 1abc0e1..5a97661 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit 1abc0e13bc6d66b4cfe6e6ecc5a615be7123ef9d +Subproject commit 5a9766198661f5013304d9486f04f866cf318bec From 767e7990fc8aff7947ca061a6ec2a75442a55c7d Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Wed, 15 Jan 2025 08:24:35 +0000 Subject: [PATCH 4/5] Revert "Build solution without bJog commands (pull request #99)" --- 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 ecaa2b6..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 5a97661..1abc0e1 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit 5a9766198661f5013304d9486f04f866cf318bec +Subproject commit 1abc0e13bc6d66b4cfe6e6ecc5a615be7123ef9d From 9118b0ba498193c090e3076d65bcd558e5f1ecf8 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Wed, 15 Jan 2025 09:28:43 +0100 Subject: [PATCH 5/5] Update tc_mca_std_lib pointer to commit fc220ef --- 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 27a93cd..fc220ef 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit 27a93cd6a0bb13b48be2c5161c5d8b19d2ff5126 +Subproject commit fc220ef0baefd495d263266194fa31fa03a21d0c