From 2222e7539e00eb8dbb99c72d4838ee2816eb0277 Mon Sep 17 00:00:00 2001
From: SCooper <simon.cooper@stfc.ac.uk>
Date: Wed, 27 Jul 2022 15:25:53 +0100
Subject: [PATCH] refactoring to clean up whitespace

---
 solution/tc_project_app/POUs/MAIN.TcPOU         |  7 ++-----
 solution/tc_project_app/tc_project_app.tmcRefac | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 solution/tc_project_app/tc_project_app.tmcRefac

diff --git a/solution/tc_project_app/POUs/MAIN.TcPOU b/solution/tc_project_app/POUs/MAIN.TcPOU
index a4d6184..fdeebfe 100644
--- a/solution/tc_project_app/POUs/MAIN.TcPOU
+++ b/solution/tc_project_app/POUs/MAIN.TcPOU
@@ -6,7 +6,6 @@ VAR
     sVersion: STRING := '1.0.0';
     aIAxes : ARRAY [1..GVL_APP.nAXIS_NUM] OF I_Axis;
     afbAxes: ARRAY [1..GVL_APP.nAXIS_NUM] OF FB_Axis;
-    afbAxesV2: ARRAY [1..GVL_APP.nAXIS_NUM] OF FB_Axis_V2;
     afbPneumaticAxes: ARRAY [1..GVL_APP.nPNEUMATIC_AXIS_NUM] OF FB_PneumaticAxis;
     hmiAxisSelection: INT := 1; //Not possible to use local hmi variables for array indexes
     hmiPneumaticAxisSelection: INT := 1;
@@ -22,8 +21,6 @@ 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
@@ -43,8 +40,8 @@ GVL.fbGetCurTaskIndex();
 
 IF _TaskInfo[fbGetCurTaskIndex.index].FirstCycle THEN
     FOR GVL.iAxis := 1 TO GVL_APP.nAXIS_NUM DO
-        afbAxesV2[GVL.iAxis].stAxis REF= astAxes[GVL.iAxis];
-        aIAxes[GVL.iAxis] := afbAxesV2[GVL.iAxis];
+        afbAxes[GVL.iAxis].stAxis REF= astAxes[GVL.iAxis];
+        aIAxes[GVL.iAxis] := afbAxes[GVL.iAxis];
     END_FOR
 END_IF
 
diff --git a/solution/tc_project_app/tc_project_app.tmcRefac b/solution/tc_project_app/tc_project_app.tmcRefac
new file mode 100644
index 0000000..df9ad91
--- /dev/null
+++ b/solution/tc_project_app/tc_project_app.tmcRefac
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Refactors>
+  <Renames>
+    <RenamedType>
+      <Type guid="ade71f2f-2325-4792-8103-f7cd9c07d44a">FB_AXIS_V2</Type>
+      <From>FB_Axis_V2</From>
+      <To>FB_Axis</To>
+    </RenamedType>
+    <RenamedSymbol>
+      <Type guid="33eb6f49-7781-4211-a70b-87ada6d80cb7">MAIN</Type>
+      <From>afbAxesV2</From>
+      <To>afbAxes</To>
+    </RenamedSymbol>
+  </Renames>
+</Refactors>
\ No newline at end of file