From 27e8814a66edc7ea6299b858165eb6737de67739 Mon Sep 17 00:00:00 2001
From: kleines <h.kleines@fz-juelich.de>
Date: Wed, 4 Mar 2020 13:00:17 +0100
Subject: [PATCH 1/2] added descriptive substructure to axes struct in std_lib

---
 solution/solution.tsproj                       |  8 --------
 solution/tc_project_app/tc_mca_std_lib         |  2 +-
 solution/tc_project_app/tc_project_app.plcproj | 12 ++++++++++++
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/solution/solution.tsproj b/solution/solution.tsproj
index 36de82a..6f0e066 100644
--- a/solution/solution.tsproj
+++ b/solution/solution.tsproj
@@ -33,14 +33,6 @@
 				<Instance Id="#x08502040" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tc_project_app\tc_project_app.tmc">
 					<Name>tc_project_app Instance</Name>
 					<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
-					<Vars VarGrpType="2">
-						<Name>PlcTask Outputs</Name>
-						<Var>
-							<Name>MAIN.bOutput1</Name>
-							<Comment><![CDATA[*****Outputs: Power for Limit switches and Home Sensors (every 4th output)*******]]></Comment>
-							<Type>BOOL</Type>
-						</Var>
-					</Vars>
 					<TaskPouOids>
 						<TaskPouOid Prio="20" OTCID="#x08502041"/>
 					</TaskPouOids>
diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib
index 85f11c0..c4ed7b7 160000
--- a/solution/tc_project_app/tc_mca_std_lib
+++ b/solution/tc_project_app/tc_mca_std_lib
@@ -1 +1 @@
-Subproject commit 85f11c08bc807bda1e02aa5c635a789d355da20c
+Subproject commit c4ed7b7c9b340c68f26e38a539fb35719d6ca848
diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj
index f8a5867..0b03985 100644
--- a/solution/tc_project_app/tc_project_app.plcproj
+++ b/solution/tc_project_app/tc_project_app.plcproj
@@ -29,6 +29,15 @@
     <Compile Include="POUs\MAIN.TcPOU">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="tc_mca_std_lib\DUTs\MotorTypeClass.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="tc_mca_std_lib\DUTs\EncoderTypeClass.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="tc_mca_std_lib\DUTs\HomeSwitchTypeClass.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="tc_mca_std_lib\DUTs\RestorePosition.TcDUT">
       <SubType>Code</SubType>
     </Compile>
@@ -41,6 +50,9 @@
     <Compile Include="tc_mca_std_lib\DUTs\MotionFunctions.TcDUT">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="tc_mca_std_lib\DUTs\ST_AxisDescription.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="tc_mca_std_lib\DUTs\ST_AxisInputs.TcDUT">
       <SubType>Code</SubType>
     </Compile>

From ed55d3823add3e6c57d9d3027944d08baa5facc6 Mon Sep 17 00:00:00 2001
From: kleines <h.kleines@fz-juelich.de>
Date: Wed, 4 Mar 2020 17:23:20 +0100
Subject: [PATCH 2/2] changed enums to coding conventions

---
 solution/solution.tsproj                      | 17 ++++++-----
 solution/tc_project_app/tc_mca_std_lib        |  2 +-
 .../tc_project_app/tc_project_app.plcproj     | 28 +++++++++----------
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/solution/solution.tsproj b/solution/solution.tsproj
index 6f0e066..86eb586 100644
--- a/solution/solution.tsproj
+++ b/solution/solution.tsproj
@@ -20,19 +20,18 @@
 			<NC File="NC.xti"/>
 		</Motion>
 		<Plc>
-			<Project GUID="{F935F1DE-0753-4702-B418-1DC0ED040A4D}" Name="tc_epicscommodule" PrjFilePath="tc_epicscommodule\tc_epicscommodule.plcproj" TmcFilePath="tc_epicscommodule\tc_epicscommodule.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" SymbolicMapping="true">
-				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tc_epicscommodule\tc_epicscommodule.tmc">
-					<Name>tc_epicscommodule Instance</Name>
-					<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
-					<TaskPouOids>
-						<TaskPouOid Prio="26" OTCID="#x08502001"/>
-					</TaskPouOids>
-				</Instance>
-			</Project>
 			<Project GUID="{FB261665-FD20-4BF2-97F8-2854C82B752D}" Name="tc_project_app" PrjFilePath="tc_project_app\tc_project_app.plcproj" TmcFilePath="tc_project_app\tc_project_app.tmc" ReloadTmc="true" AmsPort="852" FileArchiveSettings="#x000e" SymbolicMapping="true">
 				<Instance Id="#x08502040" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tc_project_app\tc_project_app.tmc">
 					<Name>tc_project_app Instance</Name>
 					<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
+					<Vars VarGrpType="2">
+						<Name>PlcTask Outputs</Name>
+						<Var>
+							<Name>MAIN.bOutput1</Name>
+							<Comment><![CDATA[*****Outputs: Power for Limit switches and Home Sensors (every 4th output)*******]]></Comment>
+							<Type>BOOL</Type>
+						</Var>
+					</Vars>
 					<TaskPouOids>
 						<TaskPouOid Prio="20" OTCID="#x08502041"/>
 					</TaskPouOids>
diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib
index c4ed7b7..d74f871 160000
--- a/solution/tc_project_app/tc_mca_std_lib
+++ b/solution/tc_project_app/tc_mca_std_lib
@@ -1 +1 @@
-Subproject commit c4ed7b7c9b340c68f26e38a539fb35719d6ca848
+Subproject commit d74f8715e1d87ce8570848b95078565a88946c3b
diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj
index 0b03985..c39e3ed 100644
--- a/solution/tc_project_app/tc_project_app.plcproj
+++ b/solution/tc_project_app/tc_project_app.plcproj
@@ -29,13 +29,13 @@
     <Compile Include="POUs\MAIN.TcPOU">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="tc_mca_std_lib\DUTs\MotorTypeClass.TcDUT">
+    <Compile Include="tc_mca_std_lib\DUTs\E_MotorTypeClass.TcDUT">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="tc_mca_std_lib\DUTs\EncoderTypeClass.TcDUT">
+    <Compile Include="tc_mca_std_lib\DUTs\E_EncoderTypeClass.TcDUT">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="tc_mca_std_lib\DUTs\HomeSwitchTypeClass.TcDUT">
+    <Compile Include="tc_mca_std_lib\DUTs\E_HomeSwitchTypeClass.TcDUT">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="tc_mca_std_lib\DUTs\RestorePosition.TcDUT">
@@ -243,8 +243,8 @@
   <ProjectExtensions>
     <PlcProjectOptions>
       <XmlArchive>
-  <Data>
-    <o xml:space="preserve" t="OptionKey">
+        <Data>
+          <o xml:space="preserve" t="OptionKey">
       <v n="Name">"&lt;ProjectRoot&gt;"</v>
       <d n="SubKeys" t="Hashtable" ckt="String" cvt="OptionKey">
         <v>{192FAD59-8248-4824-A8DE-9177C94C195A}</v>
@@ -295,15 +295,15 @@
       </d>
       <d n="Values" t="Hashtable" />
     </o>
-  </Data>
-  <TypeList>
-    <Type n="Boolean">System.Boolean</Type>
-    <Type n="Hashtable">System.Collections.Hashtable</Type>
-    <Type n="Int32">System.Int32</Type>
-    <Type n="OptionKey">{54dd0eac-a6d8-46f2-8c27-2f43c7e49861}</Type>
-    <Type n="String">System.String</Type>
-  </TypeList>
-</XmlArchive>
+        </Data>
+        <TypeList>
+          <Type n="Boolean">System.Boolean</Type>
+          <Type n="Hashtable">System.Collections.Hashtable</Type>
+          <Type n="Int32">System.Int32</Type>
+          <Type n="OptionKey">{54dd0eac-a6d8-46f2-8c27-2f43c7e49861}</Type>
+          <Type n="String">System.String</Type>
+        </TypeList>
+      </XmlArchive>
     </PlcProjectOptions>
   </ProjectExtensions>
 </Project>
\ No newline at end of file