From 2bdf9e786bab73bdf641a6daf7c519de581eebc8 Mon Sep 17 00:00:00 2001
From: SCooper <simon.cooper@stfc.ac.uk>
Date: Wed, 27 Jul 2022 12:28:33 +0100
Subject: [PATCH] Read parameter added to OOP implementation. Visu parameter
 reads fixed to reference GVL not afbaxes. Text list support added for
 parameters to allow combo box selection on Visu rather than typing in number

---
 solution/_Config/PLC/tc_project_app.xti       |  2 +-
 solution/tc_project_app/POUs/MAIN.TcPOU       | 22 +++++++++++++++----
 .../tc_project_app/tc_project_app.plcproj     |  3 +++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/solution/_Config/PLC/tc_project_app.xti b/solution/_Config/PLC/tc_project_app.xti
index 269f8e4..1d9983f 100644
--- a/solution/_Config/PLC/tc_project_app.xti
+++ b/solution/_Config/PLC/tc_project_app.xti
@@ -965,7 +965,7 @@ External Setpoint Generation:
 		</DataType>
 	</DataTypes>
 	<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="{E56DF141-1BE7-5D15-5778-8A69FE9C46CA}">
+		<Instance Id="#x08502040" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tc_project_app\tc_project_app.tmc" TmcHash="{7B9E6ECB-640A-4561-FA07-16CE75557D30}">
 			<Name>tc_project_app Instance</Name>
 			<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 			<Vars VarGrpType="1">
diff --git a/solution/tc_project_app/POUs/MAIN.TcPOU b/solution/tc_project_app/POUs/MAIN.TcPOU
index 03737b6..a4d6184 100644
--- a/solution/tc_project_app/POUs/MAIN.TcPOU
+++ b/solution/tc_project_app/POUs/MAIN.TcPOU
@@ -22,6 +22,8 @@ VAR
     afbReadEncRefSys: ARRAY [1..GVL_APP.nAXIS_NUM] OF MC_ReadParameter;
     afbRestorePosition: ARRAY [1..GVL_APP.nAXIS_NUM] OF MC_SetPosition;
     fbGetDeviceIdentification: FB_GetDeviceIdentification;
+    
+    counter : BYTE;
 END_VAR
 
 VAR PERSISTENT
@@ -30,7 +32,8 @@ END_VAR]]></Declaration>
     <Implementation>
       <ST><![CDATA[POSITION_RECOVERY();
 AXES();
-PROG();]]></ST>
+PROG();
+AXES_EndOfCycle();]]></ST>
     </Implementation>
     <Folder Name="POSITION_RECOVERY" Id="{3561f6ef-e145-4ed3-9839-f17334bd2d97}" />
     <Action Name="AXES" Id="{7eb32732-9b53-4934-8cd9-20ba971dd8ff}">
@@ -58,6 +61,14 @@ END_FOR*)
 FOR GVL.iPneumaticAxis := 1 TO GVL_APP.nPNEUMATIC_AXIS_NUM DO
     afbPneumaticAxes[GVL.iPneumaticAxis](stPneumaticAxisStruct := GVL.astPneumaticAxes[GVL.iPneumaticAxis]);
 END_FOR
+]]></ST>
+      </Implementation>
+    </Action>
+    <Action Name="AXES_EndOfCycle" Id="{1d0c47cf-5c32-4a53-bfaa-da9593fd6c0d}">
+      <Implementation>
+        <ST><![CDATA[FOR GVL.iAxis := 1 TO GVL_APP.nAXIS_NUM DO
+    aIAxes[GVL.iAxis].EndOfCycle();
+END_FOR
 ]]></ST>
       </Implementation>
     </Action>
@@ -109,8 +120,7 @@ IF astAxes[1].stStatus.fActPosition < -5 THEN
     astAxes[1].stInputs.bLimitBwd := FALSE;
 ELSE
     astAxes[1].stInputs.bLimitBwd := TRUE;
-END_IF
-]]></ST>
+END_IF]]></ST>
       </Implementation>
     </Action>
     <Action Name="RESTORE_POSITIONS" Id="{0c7ee537-7bd9-4833-b428-c17cbb57e893}" FolderPath="POSITION_RECOVERY\">
@@ -241,6 +251,7 @@ END_FOR]]></ST>
       <LineId Id="505" Count="0" />
       <LineId Id="81" Count="0" />
       <LineId Id="538" Count="0" />
+      <LineId Id="568" Count="0" />
     </LineIds>
     <LineIds Name="MAIN.AXES">
       <LineId Id="11" Count="1" />
@@ -260,6 +271,10 @@ END_FOR]]></ST>
       <LineId Id="18" Count="3" />
       <LineId Id="17" Count="0" />
     </LineIds>
+    <LineIds Name="MAIN.AXES_EndOfCycle">
+      <LineId Id="2" Count="2" />
+      <LineId Id="1" Count="0" />
+    </LineIds>
     <LineIds Name="MAIN.CHECK_UPS">
       <LineId Id="2" Count="11" />
       <LineId Id="1" Count="0" />
@@ -284,7 +299,6 @@ END_FOR]]></ST>
       <LineId Id="16" Count="0" />
       <LineId Id="20" Count="4" />
       <LineId Id="19" Count="0" />
-      <LineId Id="11" Count="0" />
     </LineIds>
     <LineIds Name="MAIN.RESTORE_POSITIONS">
       <LineId Id="567" Count="105" />
diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj
index 7c4e37a..8c8c8df 100644
--- a/solution/tc_project_app/tc_project_app.plcproj
+++ b/solution/tc_project_app/tc_project_app.plcproj
@@ -149,6 +149,9 @@
       <SubType>Code</SubType>
       <DependentUpon>Visualization Manager.TcVMO</DependentUpon>
     </Compile>
+    <Compile Include="tc_mca_std_lib\VISUs\ParameterTextList.TcTLO">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="tc_mca_std_lib\VISUs\PneumaticsVisu.TcVIS">
       <SubType>Code</SubType>
       <DependentUpon>Visualization Manager.TcVMO</DependentUpon>