From 0d193957ac040f6329f60049ec3044aec7294328 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Thu, 10 Jun 2021 16:45:56 +0200 Subject: [PATCH 1/2] Update tc_mca_std_lib to latest commit --- solution/tc_project_app/GlobalTextList.TcGTLO | 45 +++++++++++++++++++ .../Applications/Application_Template.TcPOU | 0 .../Axes/Axis_Template.TcPOU | 2 - solution/tc_project_app/tc_mca_std_lib | 2 +- .../tc_project_app/tc_project_app.plcproj | 10 ++--- 5 files changed, 51 insertions(+), 8 deletions(-) rename solution/tc_project_app/POUs/{Application Specific => Application_Specific}/Applications/Application_Template.TcPOU (100%) rename solution/tc_project_app/POUs/{Application Specific => Application_Specific}/Axes/Axis_Template.TcPOU (90%) diff --git a/solution/tc_project_app/GlobalTextList.TcGTLO b/solution/tc_project_app/GlobalTextList.TcGTLO index c1bb3b1..550df53 100644 --- a/solution/tc_project_app/GlobalTextList.TcGTLO +++ b/solution/tc_project_app/GlobalTextList.TcGTLO @@ -5,6 +5,11 @@ + + "947" + " LocalMode" + + "951" "%2.2f" @@ -105,6 +110,16 @@ "bCommandAborted" + + "786" + "Bwd Enable" + + + + "571" + "BWD Limit" + + "986" "ehomeDirect" @@ -230,6 +245,16 @@ "fVelocity" + + "668" + "Fwd Enable" + + + + "737" + "FWD Limit" + + "688" "fWriteAxisParameter" @@ -270,6 +295,16 @@ "homeSensorPos" + + "784" + "Interlock Bwd" + + + + "505" + "Interlock Fwd" + + "116" "jogBw" @@ -280,6 +315,16 @@ "jogFw" + + "167" + "Limit Bwd" + + + + "11" + "Limit Fwd" + + "298" "masterGear" 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 similarity index 100% rename from solution/tc_project_app/POUs/Application Specific/Applications/Application_Template.TcPOU rename to solution/tc_project_app/POUs/Application_Specific/Applications/Application_Template.TcPOU 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 similarity index 90% rename from solution/tc_project_app/POUs/Application Specific/Axes/Axis_Template.TcPOU rename to solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU index d37b2de..dfff176 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 @@ -10,7 +10,6 @@ END_VAR - diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib index 7e93c0d..c198dd2 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit 7e93c0d9ce769167525fd94a5d6fcb53764de897 +Subproject commit c198dd2a34857efe43d40cf58ecbd306d6615308 diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index 48db3f3..2d792b5 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -27,10 +27,10 @@ Code - + Code - + Code @@ -113,9 +113,8 @@ - - - + + @@ -124,6 +123,7 @@ + From 0ca1513fcd8a1f95c23faaf0a008e3284cb8cb14 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Thu, 17 Jun 2021 13:24:46 +0200 Subject: [PATCH 2/2] Update submodule pointer to latest commit --- 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 c198dd2..bc5e78c 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit c198dd2a34857efe43d40cf58ecbd306d6615308 +Subproject commit bc5e78c637180c1baec5294f4974dbd5dd4a9bed