From 0ffd68a57406ee7db5abe8edfc4f25899f05c7d6 Mon Sep 17 00:00:00 2001
From: Frank Suxdorf <f.suxdorf@fz-juelich.de>
Date: Thu, 16 May 2019 13:33:12 +0200
Subject: [PATCH 1/2] Add nested strutures to tc_mca_std_lib

---
 solution/solution.tsproj                       | 10 +++++-----
 solution/tc_project_app/tc_project_app.plcproj | 12 ++++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/solution/solution.tsproj b/solution/solution.tsproj
index 313b9a2..ee3987e 100644
--- a/solution/solution.tsproj
+++ b/solution/solution.tsproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4022.16">
+<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4022.22">
 	<DataTypes>
 		<DataType>
 			<Name GUID="{4C3FC5AC-D5AA-44C6-AC5A-159774BA0F6D}" Namespace="MC" TcBaseType="true" HideType="true" IecDeclaration="DWORD;">NCTOPLC_AXIS_REF_STATE</Name>
@@ -931,28 +931,28 @@ External Setpoint Generation:
 					<Vars VarGrpType="1">
 						<Name>PlcTask Inputs</Name>
 						<Var>
-							<Name>GVL.axes[1].bLimitFwd</Name>
+							<Name>GVL.axes[1].inputs.bLimitFwd</Name>
 							<Comment>
 								<![CDATA[////Axis Inputs///////]]>
 							</Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
-							<Name>GVL.axes[1].bLimitBwd</Name>
+							<Name>GVL.axes[1].inputs.bLimitBwd</Name>
 							<Comment>
 								<![CDATA[Backward limit switch]]>
 							</Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
-							<Name>GVL.axes[1].bHomeSensor</Name>
+							<Name>GVL.axes[1].inputs.bHomeSensor</Name>
 							<Comment>
 								<![CDATA[Reference siganl for homing]]>
 							</Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
-							<Name>GVL.axes[1].bEncLAtch</Name>
+							<Name>GVL.axes[1].inputs.bEncLAtch</Name>
 							<Comment>
 								<![CDATA[Reference index signal from inc. enconder]]>
 							</Comment>
diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj
index 325287e..66dc2e4 100644
--- a/solution/tc_project_app/tc_project_app.plcproj
+++ b/solution/tc_project_app/tc_project_app.plcproj
@@ -22,9 +22,21 @@
     <Compile Include="POUs\MAIN.TcPOU">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="tc_mca_std_lib\DUTs\ST_AxisConfig.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="tc_mca_std_lib\DUTs\ST_AxisControl.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="tc_mca_std_lib\DUTs\MotionFunctions.TcDUT">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="tc_mca_std_lib\DUTs\ST_AxisInputs.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="tc_mca_std_lib\DUTs\ST_AxisStatus.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="tc_mca_std_lib\DUTs\ST_AxisStruct.TcDUT">
       <SubType>Code</SubType>
     </Compile>

From d2e05e98cf4e122d4844897360a2e3f8ca1ff01f Mon Sep 17 00:00:00 2001
From: Federico Rojas <federicorojas@esss.se>
Date: Mon, 17 Jun 2019 16:38:05 +0200
Subject: [PATCH 2/2] integration bracnh ponitng to integration branch in
 tc_mca_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 936ed0e..5eb56db 160000
--- a/solution/tc_project_app/tc_mca_std_lib
+++ b/solution/tc_project_app/tc_mca_std_lib
@@ -1 +1 @@
-Subproject commit 936ed0e9d0f34f876c91cf857ee389ed8ea4eb61
+Subproject commit 5eb56db806fd52bae29f59bfb59f2a42328fb61d