From 05927a40a64f4f1bf38368e83045890618198dd6 Mon Sep 17 00:00:00 2001
From: Federico Rojas <federicorojas@esss.se>
Date: Thu, 1 Aug 2019 13:03:33 +0200
Subject: [PATCH] Change all references and links from GVL.axisNum to
 GVL_APP.axisNum

---
 solution/tc_project_app/POUs/MAIN.TcPOU        | 8 ++++----
 solution/tc_project_app/tc_mca_std_lib         | 2 +-
 solution/tc_project_app/tc_project_app.plcproj | 4 ++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/solution/tc_project_app/POUs/MAIN.TcPOU b/solution/tc_project_app/POUs/MAIN.TcPOU
index dd8707e..1b367f8 100644
--- a/solution/tc_project_app/POUs/MAIN.TcPOU
+++ b/solution/tc_project_app/POUs/MAIN.TcPOU
@@ -5,7 +5,7 @@
 VAR
 	sVersion: STRING:='1.0.0';
 	i : UINT; //index variable for AXES()
-	aFbAxes: ARRAY [1..gvl.axisNum] OF FB_Axis;
+	aFbAxes: ARRAY [1..gvl_app.axisNum] OF FB_Axis;
 	hmiAxisSelection	:	INT:=1;		//Not possible to use local hmi variables for array indexes
 	
 (******Outputs: Power for Limit switches and Home Sensors (every 4th output)********)
@@ -27,7 +27,7 @@ VAR
 	
 (******Error Handling********)
 	fbErrorSystem: FB_ErrorSystem;
-	aFbAxesError: ARRAY [1..gvl.axisNum] OF FB_NC_Error;
+	aFbAxesError: ARRAY [1..gvl_app.axisNum] OF FB_NC_Error;
 	
 	//fbEL1018	: EL1018;
 	//fbEL2808	: EL2808;
@@ -51,7 +51,7 @@ ERROR();]]></ST>
     <Action Name="AXES" Id="{7eb32732-9b53-4934-8cd9-20ba971dd8ff}">
       <Implementation>
         <ST><![CDATA[
-FOR GVL.iAxis:=1 TO gvl.axisNum DO
+FOR GVL.iAxis:=1 TO gvl_app.axisNum DO
 	aFbAxes[GVL.iAxis](stAxisStruct:=gvl.axes[GVL.iAxis]);
 END_FOR
 
@@ -76,7 +76,7 @@ fbErrorSystem(
 	pErrorSystem=> );
 
 
-FOR GVL.iAxis:=1 TO gvl.axisNum DO
+FOR GVL.iAxis:=1 TO gvl_app.axisNum DO
 	aFbAxesError[gvl.iAxis](EN:=TRUE, 
 	nNC_ErrorID:= gvl.axes[gvl.iAxis].status.nErrorID, 
 	nNC_AxisID:=gvl.axes[gvl.iAxis].Axis.NcToPlc.AxisId, 
diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib
index 1a5fa47..f2b1862 160000
--- a/solution/tc_project_app/tc_mca_std_lib
+++ b/solution/tc_project_app/tc_mca_std_lib
@@ -1 +1 @@
-Subproject commit 1a5fa47db49901bee67a942ad2ce5447a7903b0a
+Subproject commit f2b186273119f71345ff25367b3145b07dfa66f4
diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj
index b6cbc8b..903cef5 100644
--- a/solution/tc_project_app/tc_project_app.plcproj
+++ b/solution/tc_project_app/tc_project_app.plcproj
@@ -19,6 +19,10 @@
     <Compile Include="GlobalTextList.TcGTLO">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="GVLs\GVL_APP.TcGVL">
+      <SubType>Code</SubType>
+      <LinkAlways>true</LinkAlways>
+    </Compile>
     <Compile Include="PlcTask.TcTTO">
       <SubType>Code</SubType>
     </Compile>