From 0adff94a4633938c36b9121b75801c2a130f70ea Mon Sep 17 00:00:00 2001
From: Dominic Oram <dominic.oram@stfc.ac.uk>
Date: Fri, 11 Oct 2019 23:13:43 +0100
Subject: [PATCH] Updated version

---
 solution/solution.tsproj                      | 137 ++++++------------
 solution/tc_project_app/GVLs/GVL_APP.TcGVL    |   2 +-
 solution/tc_project_app/GlobalTextList.TcGTLO |   2 +-
 solution/tc_project_app/POUs/MAIN.TcPOU       |   2 +-
 solution/tc_project_app/PlcTask.TcTTO         |   2 +-
 .../Visualization Manager.TcVMO               |   2 +-
 solution/tc_project_app/tc_mca_std_lib        |   2 +-
 7 files changed, 48 insertions(+), 101 deletions(-)

diff --git a/solution/solution.tsproj b/solution/solution.tsproj
index 9224788..d85e701 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.28">
+<?xml version="1.0"?>
+<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.4024.0">
 	<DataTypes>
 		<DataType>
 			<Name GUID="{4C3FC5AC-D5AA-44C6-AC5A-159774BA0F6D}" Namespace="MC" TcBaseType="true" HideType="true" IecDeclaration="DWORD;">NCTOPLC_AXIS_REF_STATE</Name>
@@ -411,8 +411,7 @@
 			<SubItem>
 				<Name>AxisState</Name>
 				<Type GUID="{18071995-0000-0000-0000-000000000008}">UDINT</Type>
-				<Comment>
-					<![CDATA[Present State Of The Axis Movement (continuous axis):
+				<Comment><![CDATA[Present State Of The Axis Movement (continuous axis):
 0  = INACTIVE:		axis has no job
 1  = RUNNING:		axis is executing a motion job
 2  = OVERRIDE_ZERO:	axis is executing a job but override is zero
@@ -426,8 +425,7 @@ Slaves only:
 External Setpoint Generation:
 41 = EXTSETGEN_MODE1:	external setpoint generation active
 42 = EXTSETGEN_MODE2:	internal and external setpoint gen. active
-]]>
-				</Comment>
+]]></Comment>
 				<BitSize>32</BitSize>
 				<BitOffs>64</BitOffs>
 			</SubItem>
@@ -440,8 +438,7 @@ External Setpoint Generation:
 			<SubItem>
 				<Name>HomingState</Name>
 				<Type GUID="{18071995-0000-0000-0000-000000000008}">UDINT</Type>
-				<Comment>
-					<![CDATA[Axis Homing Status:
+				<Comment><![CDATA[Axis Homing Status:
 0: idle
 1: start homing
 2: searching home switch
@@ -449,22 +446,19 @@ External Setpoint Generation:
 4: moving off home switch
 5: searching sync pulse
 6: stopping after homing
-]]>
-				</Comment>
+]]></Comment>
 				<BitSize>32</BitSize>
 				<BitOffs>128</BitOffs>
 			</SubItem>
 			<SubItem>
 				<Name>CoupleState</Name>
 				<Type GUID="{18071995-0000-0000-0000-000000000008}">UDINT</Type>
-				<Comment>
-					<![CDATA[Axis Coupling Status:
+				<Comment><![CDATA[Axis Coupling Status:
 0: axis is a single axis (not coupled)
 1: axis is a master axis
 2: axis is master and slave
 3: axis is a slave axis
-]]>
-				</Comment>
+]]></Comment>
 				<BitSize>32</BitSize>
 				<BitOffs>160</BitOffs>
 			</SubItem>
@@ -690,13 +684,13 @@ External Setpoint Generation:
 					<Type GUID="{F794B740-82D7-4637-848E-4F74A711D038}">NCAXLESTRUCT_TOPLC4</Type>
 				</Relation>
 				<Relation Priority="100">
-					<Type GUID="{40BD39B0-C3EA-4F74-9F4F-5F1982786F7C}"/>
+					<Type GUID="{40BD39B0-C3EA-4F74-9F4F-5F1982786F7C}"></Type>
 				</Relation>
 				<Relation Priority="100">
-					<Type GUID="{40BD39B2-C3EA-4F74-9F4F-5F1982786F7C}"/>
+					<Type GUID="{40BD39B2-C3EA-4F74-9F4F-5F1982786F7C}"></Type>
 				</Relation>
 				<Relation Priority="100">
-					<Type GUID="{8CDE0C45-AB9D-42DB-BC94-1CF7521AB268}"/>
+					<Type GUID="{8CDE0C45-AB9D-42DB-BC94-1CF7521AB268}"></Type>
 				</Relation>
 			</Relations>
 		</DataType>
@@ -913,30 +907,22 @@ External Setpoint Generation:
 						<Name>PlcTask Inputs</Name>
 						<Var>
 							<Name>GVL.axes[1].inputs.bLimitFwd</Name>
-							<Comment>
-								<![CDATA[////Axis Inputs///////]]>
-							</Comment>
+							<Comment><![CDATA[////Axis Inputs///////]]></Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
 							<Name>GVL.axes[1].inputs.bLimitBwd</Name>
-							<Comment>
-								<![CDATA[Backward limit switch]]>
-							</Comment>
+							<Comment><![CDATA[Backward limit switch]]></Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
 							<Name>GVL.axes[1].inputs.bHomeSensor</Name>
-							<Comment>
-								<![CDATA[Reference siganl for homing]]>
-							</Comment>
+							<Comment><![CDATA[Reference siganl for homing]]></Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
 							<Name>GVL.axes[1].inputs.bEncLAtch</Name>
-							<Comment>
-								<![CDATA[Reference index signal from inc. enconder]]>
-							</Comment>
+							<Comment><![CDATA[Reference index signal from inc. enconder]]></Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
@@ -944,8 +930,7 @@ External Setpoint Generation:
 							<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
 							<SubVar>
 								<Name>AxisState</Name>
-								<Comment>
-									<![CDATA[Present State Of The Axis Movement (continuous axis):
+								<Comment><![CDATA[Present State Of The Axis Movement (continuous axis):
 0  = INACTIVE:		axis has no job
 1  = RUNNING:		axis is executing a motion job
 2  = OVERRIDE_ZERO:	axis is executing a job but override is zero
@@ -959,13 +944,11 @@ Slaves only:
 External Setpoint Generation:
 41 = EXTSETGEN_MODE1:	external setpoint generation active
 42 = EXTSETGEN_MODE2:	internal and external setpoint gen. active
-]]>
-								</Comment>
+]]></Comment>
 							</SubVar>
 							<SubVar>
 								<Name>HomingState</Name>
-								<Comment>
-									<![CDATA[Axis Homing Status:
+								<Comment><![CDATA[Axis Homing Status:
 0: idle
 1: start homing
 2: searching home switch
@@ -973,47 +956,36 @@ External Setpoint Generation:
 4: moving off home switch
 5: searching sync pulse
 6: stopping after homing
-]]>
-								</Comment>
+]]></Comment>
 							</SubVar>
 							<SubVar>
 								<Name>CoupleState</Name>
-								<Comment>
-									<![CDATA[Axis Coupling Status:
+								<Comment><![CDATA[Axis Coupling Status:
 0: axis is a single axis (not coupled)
 1: axis is a master axis
 2: axis is master and slave
 3: axis is a slave axis
-]]>
-								</Comment>
+]]></Comment>
 							</SubVar>
 						</Var>
 						<Var>
 							<Name>GVL.axes[2].inputs.bLimitFwd</Name>
-							<Comment>
-								<![CDATA[////Axis Inputs///////]]>
-							</Comment>
+							<Comment><![CDATA[////Axis Inputs///////]]></Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
 							<Name>GVL.axes[2].inputs.bLimitBwd</Name>
-							<Comment>
-								<![CDATA[Backward limit switch]]>
-							</Comment>
+							<Comment><![CDATA[Backward limit switch]]></Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
 							<Name>GVL.axes[2].inputs.bHomeSensor</Name>
-							<Comment>
-								<![CDATA[Reference siganl for homing]]>
-							</Comment>
+							<Comment><![CDATA[Reference siganl for homing]]></Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
 							<Name>GVL.axes[2].inputs.bEncLAtch</Name>
-							<Comment>
-								<![CDATA[Reference index signal from inc. enconder]]>
-							</Comment>
+							<Comment><![CDATA[Reference index signal from inc. enconder]]></Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
@@ -1021,8 +993,7 @@ External Setpoint Generation:
 							<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
 							<SubVar>
 								<Name>AxisState</Name>
-								<Comment>
-									<![CDATA[Present State Of The Axis Movement (continuous axis):
+								<Comment><![CDATA[Present State Of The Axis Movement (continuous axis):
 0  = INACTIVE:		axis has no job
 1  = RUNNING:		axis is executing a motion job
 2  = OVERRIDE_ZERO:	axis is executing a job but override is zero
@@ -1036,13 +1007,11 @@ Slaves only:
 External Setpoint Generation:
 41 = EXTSETGEN_MODE1:	external setpoint generation active
 42 = EXTSETGEN_MODE2:	internal and external setpoint gen. active
-]]>
-								</Comment>
+]]></Comment>
 							</SubVar>
 							<SubVar>
 								<Name>HomingState</Name>
-								<Comment>
-									<![CDATA[Axis Homing Status:
+								<Comment><![CDATA[Axis Homing Status:
 0: idle
 1: start homing
 2: searching home switch
@@ -1050,47 +1019,36 @@ External Setpoint Generation:
 4: moving off home switch
 5: searching sync pulse
 6: stopping after homing
-]]>
-								</Comment>
+]]></Comment>
 							</SubVar>
 							<SubVar>
 								<Name>CoupleState</Name>
-								<Comment>
-									<![CDATA[Axis Coupling Status:
+								<Comment><![CDATA[Axis Coupling Status:
 0: axis is a single axis (not coupled)
 1: axis is a master axis
 2: axis is master and slave
 3: axis is a slave axis
-]]>
-								</Comment>
+]]></Comment>
 							</SubVar>
 						</Var>
 						<Var>
 							<Name>GVL.axes[3].inputs.bLimitFwd</Name>
-							<Comment>
-								<![CDATA[////Axis Inputs///////]]>
-							</Comment>
+							<Comment><![CDATA[////Axis Inputs///////]]></Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
 							<Name>GVL.axes[3].inputs.bLimitBwd</Name>
-							<Comment>
-								<![CDATA[Backward limit switch]]>
-							</Comment>
+							<Comment><![CDATA[Backward limit switch]]></Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
 							<Name>GVL.axes[3].inputs.bHomeSensor</Name>
-							<Comment>
-								<![CDATA[Reference siganl for homing]]>
-							</Comment>
+							<Comment><![CDATA[Reference siganl for homing]]></Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
 							<Name>GVL.axes[3].inputs.bEncLAtch</Name>
-							<Comment>
-								<![CDATA[Reference index signal from inc. enconder]]>
-							</Comment>
+							<Comment><![CDATA[Reference index signal from inc. enconder]]></Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
@@ -1098,8 +1056,7 @@ External Setpoint Generation:
 							<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
 							<SubVar>
 								<Name>AxisState</Name>
-								<Comment>
-									<![CDATA[Present State Of The Axis Movement (continuous axis):
+								<Comment><![CDATA[Present State Of The Axis Movement (continuous axis):
 0  = INACTIVE:		axis has no job
 1  = RUNNING:		axis is executing a motion job
 2  = OVERRIDE_ZERO:	axis is executing a job but override is zero
@@ -1113,13 +1070,11 @@ Slaves only:
 External Setpoint Generation:
 41 = EXTSETGEN_MODE1:	external setpoint generation active
 42 = EXTSETGEN_MODE2:	internal and external setpoint gen. active
-]]>
-								</Comment>
+]]></Comment>
 							</SubVar>
 							<SubVar>
 								<Name>HomingState</Name>
-								<Comment>
-									<![CDATA[Axis Homing Status:
+								<Comment><![CDATA[Axis Homing Status:
 0: idle
 1: start homing
 2: searching home switch
@@ -1127,19 +1082,16 @@ External Setpoint Generation:
 4: moving off home switch
 5: searching sync pulse
 6: stopping after homing
-]]>
-								</Comment>
+]]></Comment>
 							</SubVar>
 							<SubVar>
 								<Name>CoupleState</Name>
-								<Comment>
-									<![CDATA[Axis Coupling Status:
+								<Comment><![CDATA[Axis Coupling Status:
 0: axis is a single axis (not coupled)
 1: axis is a master axis
 2: axis is master and slave
 3: axis is a slave axis
-]]>
-								</Comment>
+]]></Comment>
 							</SubVar>
 						</Var>
 					</Vars>
@@ -1147,9 +1099,7 @@ External Setpoint Generation:
 						<Name>PlcTask Outputs</Name>
 						<Var>
 							<Name>MAIN.bOutput1</Name>
-							<Comment>
-								<![CDATA[*****Outputs: Power for Limit switches and Home Sensors (every 4th output)*******]]>
-							</Comment>
+							<Comment><![CDATA[*****Outputs: Power for Limit switches and Home Sensors (every 4th output)*******]]></Comment>
 							<Type>BOOL</Type>
 						</Var>
 						<Var>
@@ -1172,7 +1122,4 @@ External Setpoint Generation:
 			</Project>
 		</Plc>
 	</Project>
-	<Mappings>
-		<MappingInfo Identifier="{05000010-2041-0850-3000-040340205008}" Id="#x02030010" Watchdog="04000000080000000400000004000000"/>
-	</Mappings>
 </TcSmProject>
diff --git a/solution/tc_project_app/GVLs/GVL_APP.TcGVL b/solution/tc_project_app/GVLs/GVL_APP.TcGVL
index a366e64..2d96afa 100644
--- a/solution/tc_project_app/GVLs/GVL_APP.TcGVL
+++ b/solution/tc_project_app/GVLs/GVL_APP.TcGVL
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.17">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
   <GVL Name="GVL_APP" Id="{8fe9690c-7907-432e-bedb-6fc99b5ce255}">
     <Declaration><![CDATA[{attribute 'qualified_only'}
 VAR_GLOBAL
diff --git a/solution/tc_project_app/GlobalTextList.TcGTLO b/solution/tc_project_app/GlobalTextList.TcGTLO
index 9aedffb..859af55 100644
--- a/solution/tc_project_app/GlobalTextList.TcGTLO
+++ b/solution/tc_project_app/GlobalTextList.TcGTLO
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.17">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
   <GlobalTextList Name="GlobalTextList" Id="{c3494959-baa5-4f73-b0cd-9c11912145dd}">
     <XmlArchive>
       <Data>
diff --git a/solution/tc_project_app/POUs/MAIN.TcPOU b/solution/tc_project_app/POUs/MAIN.TcPOU
index 1b367f8..50890c8 100644
--- a/solution/tc_project_app/POUs/MAIN.TcPOU
+++ b/solution/tc_project_app/POUs/MAIN.TcPOU
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.17">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
   <POU Name="MAIN" Id="{33eb6f49-7781-4211-a70b-87ada6d80cb7}" SpecialFunc="None">
     <Declaration><![CDATA[PROGRAM MAIN
 VAR
diff --git a/solution/tc_project_app/PlcTask.TcTTO b/solution/tc_project_app/PlcTask.TcTTO
index dfc6cfd..98d1faf 100644
--- a/solution/tc_project_app/PlcTask.TcTTO
+++ b/solution/tc_project_app/PlcTask.TcTTO
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.6">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
   <Task Name="PlcTask" Id="{96ece0eb-a21b-4000-8986-812071c196ce}">
     <!--CycleTime in micro seconds.-->
     <CycleTime>1000</CycleTime>
diff --git a/solution/tc_project_app/Visualization Manager.TcVMO b/solution/tc_project_app/Visualization Manager.TcVMO
index d2e340f..83b1ee8 100644
--- a/solution/tc_project_app/Visualization Manager.TcVMO	
+++ b/solution/tc_project_app/Visualization Manager.TcVMO	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.17">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
   <VisuManager Name="Visualization Manager" Id="{9ab27b0a-e061-4269-b032-b221661a7379}">
     <XmlArchive>
       <Data>
diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib
index f2b1862..7003429 160000
--- a/solution/tc_project_app/tc_mca_std_lib
+++ b/solution/tc_project_app/tc_mca_std_lib
@@ -1 +1 @@
-Subproject commit f2b186273119f71345ff25367b3145b07dfa66f4
+Subproject commit 7003429e2198b2e194ecb0583c6ea4ec83b898ec