Merged in MBP-202_NewSlitCode (pull request #65)

MBP-202 NewSlitCode

solution/_Config/PLC/tc_project_app.xti

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <TcSmItem 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.32" ClassName="CNestedPlcProjDef">
 	<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" TmcHash="{1D60CC3C-C46C-40CF-EEF2-AA07030AC91E}">
+		<Instance Id="#x08502040" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tc_project_app\tc_project_app.tmc" TmcHash="{3F0869C5-5C4C-2774-FAAE-E6295D2C6021}">
 			<Name>tc_project_app Instance</Name>
 			<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 			<Contexts>

solution/tc_project_app/GVLs/GVL_APP.TcGVL

@@ -10,7 +10,6 @@ VAR_GLOBAL CONSTANT
     nAXIS_NUM: UINT := 0; (*~ (OPC: 1 : available for OPC-clients)
                          (OPC_PROP[0005]: 1 : OPC_PROP_RIGHTS, here read only) *)
     nPNEUMATIC_AXIS_NUM: UINT := 0;
-END_VAR
-]]></Declaration>
+END_VAR]]></Declaration>
   </GVL>
 </TcPlcObject>

solution/tc_project_app/POUs/MAIN.TcPOU

@@ -43,8 +43,7 @@ END_FOR
 
 FOR GVL.iPneumaticAxis := 1 TO GVL_APP.nPNEUMATIC_AXIS_NUM DO
     afbPneumaticAxes[GVL.iPneumaticAxis](stPneumaticAxisStruct := GVL.astPneumaticAxes[GVL.iPneumaticAxis]);
-END_FOR
-]]></ST>
+END_FOR]]></ST>
       </Implementation>
     </Action>
     <Action Name="CHECK_UPS" Id="{f0f28f50-53b8-4f73-b0f5-6d7ce4c1636f}" FolderPath="POSITION_RECOVERY\">
@@ -75,16 +74,7 @@ END_IF]]></ST>
     </Action>
     <Action Name="PROG" Id="{5d03ebbb-2a47-4890-ad6d-e82daf72dc51}">
       <Implementation>
-        <ST><![CDATA[//Call the programs that are defined in the "Application Specific" folder.
-//Create as many programs in that folder as axes and applications you have or need
-
-//Axes initial parameters and program
-Axis_Template();
-//Pneumatics_Template();
-
-//Application program calls
-//Application_Template();
-]]></ST>
+        <ST><![CDATA[Application_Template();]]></ST>
       </Implementation>
     </Action>
     <Action Name="RESTORE_POSITIONS" Id="{0c7ee537-7bd9-4833-b428-c17cbb57e893}" FolderPath="POSITION_RECOVERY\">
@@ -212,9 +202,8 @@ END_FOR]]></ST>
       </Implementation>
     </Action>
     <LineIds Name="MAIN">
-      <LineId Id="505" Count="0" />
-      <LineId Id="81" Count="0" />
-      <LineId Id="538" Count="0" />
+      <LineId Id="640" Count="1" />
+      <LineId Id="585" Count="0" />
     </LineIds>
     <LineIds Name="MAIN.AXES">
       <LineId Id="11" Count="1" />
@@ -223,7 +212,6 @@ END_FOR]]></ST>
       <LineId Id="4" Count="0" />
       <LineId Id="10" Count="0" />
       <LineId Id="18" Count="3" />
-      <LineId Id="17" Count="0" />
     </LineIds>
     <LineIds Name="MAIN.CHECK_UPS">
       <LineId Id="2" Count="11" />
@@ -234,15 +222,7 @@ END_FOR]]></ST>
       <LineId Id="1" Count="0" />
     </LineIds>
     <LineIds Name="MAIN.PROG">
-      <LineId Id="4" Count="1" />
-      <LineId Id="7" Count="0" />
-      <LineId Id="6" Count="0" />
-      <LineId Id="8" Count="0" />
-      <LineId Id="12" Count="0" />
-      <LineId Id="10" Count="0" />
-      <LineId Id="9" Count="0" />
-      <LineId Id="3" Count="0" />
-      <LineId Id="11" Count="0" />
+      <LineId Id="14" Count="0" />
     </LineIds>
     <LineIds Name="MAIN.RESTORE_POSITIONS">
       <LineId Id="567" Count="105" />

solution/tc_project_app/tc_project_app.plcproj

@@ -65,6 +65,9 @@
     <Compile Include="tc_mca_std_lib\DUTs\E_RestorePosition.TcDUT">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="tc_mca_std_lib\DUTs\E_SlitPairStatesV2.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="tc_mca_std_lib\DUTs\Pneumatics\E_PneumaticAxisErrors.TcDUT">
       <SubType>Code</SubType>
     </Compile>
@@ -137,6 +140,9 @@
     <Compile Include="tc_mca_std_lib\POUs\Motion\FB_SlitPair.TcPOU">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="tc_mca_std_lib\POUs\Motion\FB_SlitPairV2.TcPOU">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="tc_mca_std_lib\POUs\Motion\Homing\FB_Homing.TcPOU">
       <SubType>Code</SubType>
     </Compile>
@@ -271,7 +277,7 @@
   </ItemGroup>
   <ItemGroup>
     <PlaceholderResolution Include="Tc2_MC2">
-      <Resolution>Tc2_MC2, 3.3.41.0 (Beckhoff Automation GmbH)</Resolution>
+      <Resolution>Tc2_MC2, 3.3.48.0 (Beckhoff Automation GmbH)</Resolution>
     </PlaceholderResolution>
   </ItemGroup>
   <ProjectExtensions>