From 4685872bc1c09f35749d1ff886c6e935a7766440 Mon Sep 17 00:00:00 2001
From: Federico Rojas <federico.rojas@ess.eu>
Date: Fri, 19 Aug 2022 15:28:16 +0200
Subject: [PATCH] Build solution with new state names in slit code

---
 solution/_Config/PLC/tc_project_app.xti       | 139 ------------------
 solution/tc_project_app/tc_mca_std_lib        |   2 +-
 .../tc_project_app/tc_project_app.plcproj     |  15 +-
 3 files changed, 8 insertions(+), 148 deletions(-)

diff --git a/solution/_Config/PLC/tc_project_app.xti b/solution/_Config/PLC/tc_project_app.xti
index 328ade7..2e97b49 100644
--- a/solution/_Config/PLC/tc_project_app.xti
+++ b/solution/_Config/PLC/tc_project_app.xti
@@ -1,148 +1,9 @@
 <?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}">
 			<Name>tc_project_app Instance</Name>
 			<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
-			<Vars VarGrpType="1">
-				<Name>PlcTask Inputs</Name>
-				<Var>
-					<Name>GVL.astAxes[1].stStatus.nEncoderRawCounter</Name>
-					<Comment><![CDATA[Raw encoder counter value]]></Comment>
-					<Type>UDINT</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[1].stStatus.nStepperDriveCounter</Name>
-					<Comment><![CDATA[Raw internal counter from stepper drive]]></Comment>
-					<Type>UDINT</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[1].stInputs.bLimitFwd</Name>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[1].stInputs.bLimitBwd</Name>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[1].stInputs.bHomeSensor</Name>
-					<Comment><![CDATA[Reference siganl for homing]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[1].Axis.NcToPlc</Name>
-					<Type GUID="{72F5AAAA-16DF-4ED3-8367-F6C8C3ADAE99}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[2].stStatus.nEncoderRawCounter</Name>
-					<Comment><![CDATA[Raw encoder counter value]]></Comment>
-					<Type>UDINT</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[2].stStatus.nStepperDriveCounter</Name>
-					<Comment><![CDATA[Raw internal counter from stepper drive]]></Comment>
-					<Type>UDINT</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[2].stInputs.bLimitFwd</Name>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[2].stInputs.bLimitBwd</Name>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[2].stInputs.bHomeSensor</Name>
-					<Comment><![CDATA[Reference siganl for homing]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[2].Axis.NcToPlc</Name>
-					<Type GUID="{72F5AAAA-16DF-4ED3-8367-F6C8C3ADAE99}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[3].stStatus.nEncoderRawCounter</Name>
-					<Comment><![CDATA[Raw encoder counter value]]></Comment>
-					<Type>UDINT</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[3].stStatus.nStepperDriveCounter</Name>
-					<Comment><![CDATA[Raw internal counter from stepper drive]]></Comment>
-					<Type>UDINT</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[3].stInputs.bLimitFwd</Name>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[3].stInputs.bLimitBwd</Name>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[3].stInputs.bHomeSensor</Name>
-					<Comment><![CDATA[Reference siganl for homing]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[3].Axis.NcToPlc</Name>
-					<Type GUID="{72F5AAAA-16DF-4ED3-8367-F6C8C3ADAE99}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[4].stStatus.nEncoderRawCounter</Name>
-					<Comment><![CDATA[Raw encoder counter value]]></Comment>
-					<Type>UDINT</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[4].stStatus.nStepperDriveCounter</Name>
-					<Comment><![CDATA[Raw internal counter from stepper drive]]></Comment>
-					<Type>UDINT</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[4].stInputs.bLimitFwd</Name>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[4].stInputs.bLimitBwd</Name>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[4].stInputs.bHomeSensor</Name>
-					<Comment><![CDATA[Reference siganl for homing]]></Comment>
-					<Type>BOOL</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[4].Axis.NcToPlc</Name>
-					<Type GUID="{72F5AAAA-16DF-4ED3-8367-F6C8C3ADAE99}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
-				</Var>
-			</Vars>
-			<Vars VarGrpType="2" AreaNo="1">
-				<Name>PlcTask Outputs</Name>
-				<Var>
-					<Name>Application_Template.mySlits.GapSizeEncoder</Name>
-					<Type>UDINT</Type>
-				</Var>
-				<Var>
-					<Name>Application_Template.mySlits.GapCentreEncoder</Name>
-					<Type>UDINT</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[1].Axis.PlcToNc</Name>
-					<Type GUID="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" Namespace="MC">PLCTONC_AXIS_REF</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[2].Axis.PlcToNc</Name>
-					<Type GUID="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" Namespace="MC">PLCTONC_AXIS_REF</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[3].Axis.PlcToNc</Name>
-					<Type GUID="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" Namespace="MC">PLCTONC_AXIS_REF</Type>
-				</Var>
-				<Var>
-					<Name>GVL.astAxes[4].Axis.PlcToNc</Name>
-					<Type GUID="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" Namespace="MC">PLCTONC_AXIS_REF</Type>
-				</Var>
-			</Vars>
 			<Contexts>
 				<Context>
 					<Id NeedCalleeCall="true">0</Id>
diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib
index 3bf0cb1..1ffd077 160000
--- a/solution/tc_project_app/tc_mca_std_lib
+++ b/solution/tc_project_app/tc_mca_std_lib
@@ -1 +1 @@
-Subproject commit 3bf0cb1c3a59b907195f98a5d35df6c25ff93297
+Subproject commit 1ffd077a18b685151d10b368c1149ce124dd5fe9
diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj
index e841ec8..9d3b3cc 100644
--- a/solution/tc_project_app/tc_project_app.plcproj
+++ b/solution/tc_project_app/tc_project_app.plcproj
@@ -50,6 +50,9 @@
     <Compile Include="tc_mca_std_lib\DUTs\E_AxisParameters.TcTLEO">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="tc_mca_std_lib\DUTs\E_MonitoringLedFunction.TcDUT">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="tc_mca_std_lib\DUTs\E_MotorTypeClass.TcDUT">
       <SubType>Code</SubType>
     </Compile>
@@ -122,18 +125,15 @@
     <Compile Include="tc_mca_std_lib\DUTs\ST_AxisStruct.TcDUT">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="tc_mca_std_lib\ESS\E_LedFunction.TcDUT">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="tc_mca_std_lib\ESS\FB_Monitoring.TcPOU">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="tc_mca_std_lib\ESS\ST_Alarm.TcDUT">
+    <Compile Include="tc_mca_std_lib\DUTs\ST_MonitoringAlarm.TcDUT">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="tc_mca_std_lib\GVLs\GVL.TcGVL">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="tc_mca_std_lib\POUs\FB_ESSMonitoring.TcPOU">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="tc_mca_std_lib\POUs\Motion\FB_Axis.TcPOU">
       <SubType>Code</SubType>
     </Compile>
@@ -173,7 +173,6 @@
     <Folder Include="tc_mca_std_lib\DUTs\Pneumatics" />
     <Folder Include="POUs\Application_Specific\Applications" />
     <Folder Include="POUs\Application_Specific\Axes" />
-    <Folder Include="tc_mca_std_lib\ESS" />
     <Folder Include="tc_mca_std_lib\POUs\Motion\Homing" />
     <Folder Include="tc_mca_std_lib\POUs\Pneumatics" />
     <Folder Include="tc_mca_std_lib\VISUs" />