From 653982a3161657fd294ffdc2297e0fe04950b3ad Mon Sep 17 00:00:00 2001
From: Federico Rojas <federico.rojas@ess.eu>
Date: Tue, 14 Nov 2023 15:48:49 +0100
Subject: [PATCH 1/5] Delete FB_AxisTemperature

---
 solution/tc_project_app/tc_project_app.plcproj | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj
index dd7d128..070a387 100644
--- a/solution/tc_project_app/tc_project_app.plcproj
+++ b/solution/tc_project_app/tc_project_app.plcproj
@@ -131,9 +131,6 @@
     <Compile Include="tc_mca_std_lib\GVLs\GVL.TcGVL">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="tc_mca_std_lib\POUs\FB_AxisTemperature.TcPOU">
-      <SubType>Code</SubType>
-    </Compile>
     <Compile Include="tc_mca_std_lib\POUs\FB_ESSMonitoring.TcPOU">
       <SubType>Code</SubType>
     </Compile>

From 3027f4ee107c22eb338e7a5df0848bdc2fd3f28b Mon Sep 17 00:00:00 2001
From: Federico Rojas <federico.rojas@ess.eu>
Date: Tue, 14 Nov 2023 15:49:12 +0100
Subject: [PATCH 2/5] Modify the templates to reflect the format and parameters

Add the temperature configuraiton in Axis_template
Format the var field in Application_Template
Call both from the PROG action in MAIN() as example

modified:   solution/tc_project_app/POUs/Application_Specific/Applications/Application_Template.TcPOU
modified:   solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU
modified:   solution/tc_project_app/POUs/MAIN.TcPOU
---
 .../Applications/Application_Template.TcPOU   |  3 ++-
 .../Axes/Axis_Template.TcPOU                  | 22 +++++++++++--------
 solution/tc_project_app/POUs/MAIN.TcPOU       |  4 ++--
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/solution/tc_project_app/POUs/Application_Specific/Applications/Application_Template.TcPOU b/solution/tc_project_app/POUs/Application_Specific/Applications/Application_Template.TcPOU
index dd7adb2..d1201aa 100644
--- a/solution/tc_project_app/POUs/Application_Specific/Applications/Application_Template.TcPOU
+++ b/solution/tc_project_app/POUs/Application_Specific/Applications/Application_Template.TcPOU
@@ -3,7 +3,8 @@
   <POU Name="Application_Template" Id="{4bdeebc0-15d8-4790-97d0-e9c4239d121c}" SpecialFunc="None">
     <Declaration><![CDATA[PROGRAM Application_Template
 VAR
-//Define all necessary variables for your application
+    //Define all necessary variables for your application
+
 END_VAR
 ]]></Declaration>
     <Implementation>
diff --git a/solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU b/solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU
index a81cbe6..f181670 100644
--- a/solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU
+++ b/solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU
@@ -12,19 +12,23 @@ END_VAR
 ]]></Declaration>
     <Implementation>
       <ST><![CDATA[//Initial parameters of an Axis
-(*IF _TaskInfo[fbGetCurTaskIndex.index].FirstCycle THEN
+(* Uncomment the next IF statement to configure and activate the intial parameters of the axis
+IF _TaskInfo[fbGetCurTaskIndex.index].FirstCycle THEN
     //Axis description for EPICS PV
-    GVL.astAxes[1].stDescription.sAxisName := 'MotorApplication1';
-    GVL.astAxes[1].stDescription.eUnit := E_AxisEngUnit.eMeter;
-    GVL.astAxes[1].stDescription.nPrefix := -3;
+    GVL.astAxes[x].stDescription.sAxisName := 'MotorApplication1';
+    GVL.astAxes[x].stDescription.eUnit := E_AxisEngUnit.eMeter;
+    GVL.astAxes[x].stDescription.nPrefix := -3;
 
     //Initial default values:
-    GVL.astAxes[1].stConfig.eHomeSeq := 0;
-    GVL.astAxes[1].stConfig.fHomePosition := 0.0;
-    GVL.astAxes[1].stConfig.fHomeFinishDistance := 0.0;
-    GVL.astAxes[1].stConfig.eRestorePosition := E_RestorePosition.eRestoreWithoutHome;
-END_IF*)
+    GVL.astAxes[x].stConfig.eHomeSeq := 0;
+    GVL.astAxes[x].stConfig.fHomePosition := 0.0;
+    GVL.astAxes[x].stConfig.fHomeFinishDistance := 0.0;
+    GVL.astAxes[x].stConfig.eRestorePosition := E_RestorePosition.eRestoreWithoutHome;
 
+    GVL.astAxes[x].stConfig.bEnableTemperatureDisable := FALSE;
+    GVL.astAxes[x].stConfig.fMaxTemperature := 0.0;
+END_IF
+*)
 //Define ACTIONS() or write exclusive code for an specific axis.
 (*Eg. Stop when temperature reaches certain values, reduce speed if  a signal is activated, etc.
 Eg. GVL.astAxes[x].stControl.bInterlockFwd := NOT bInterlockFwdOK;*)
diff --git a/solution/tc_project_app/POUs/MAIN.TcPOU b/solution/tc_project_app/POUs/MAIN.TcPOU
index 462b081..908d574 100644
--- a/solution/tc_project_app/POUs/MAIN.TcPOU
+++ b/solution/tc_project_app/POUs/MAIN.TcPOU
@@ -109,11 +109,11 @@ GVL.fbGetCurTaskIndex();
 //Create as many programs in that folder as axes and applications you have or need
 
 //Axes initial parameters and program
-//Axis_Template();
+Axis_Template();
 //Pneumatics_Template();
 
 //Application program calls
-//Application_Template();
+Application_Template();
 ]]></ST>
       </Implementation>
     </Action>

From 1278455adebf665f45c0a3126c696877219f99a3 Mon Sep 17 00:00:00 2001
From: Federico Rojas <federico.rojas@ess.eu>
Date: Tue, 14 Nov 2023 15:52:44 +0100
Subject: [PATCH 3/5] Update tc_mca_std_lib pointer to commit ea6826fd49

---
 solution/tc_project_app/tc_mca_std_lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib
index 0c87e0e..ea6826f 160000
--- a/solution/tc_project_app/tc_mca_std_lib
+++ b/solution/tc_project_app/tc_mca_std_lib
@@ -1 +1 @@
-Subproject commit 0c87e0e44c4a849704ba2de78b8c6ddff3ff4376
+Subproject commit ea6826fd491ad4dc0ca947dd09b17d7c7f5f9a1f

From 2ca16a4d8d71b514b23fce3ea331608b2b977fc2 Mon Sep 17 00:00:00 2001
From: Federico Rojas <federico.rojas@ess.eu>
Date: Wed, 6 Dec 2023 15:39:01 +0100
Subject: [PATCH 4/5] Build solution with the changes in std_lib for MBP-265

---
 solution/_Config/PLC/tc_project_app.xti       |  2 +-
 solution/tc_project_app/GlobalTextList.TcGTLO | 30 +++++++++++++++++++
 solution/tc_project_app/tc_mca_std_lib        |  2 +-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/solution/_Config/PLC/tc_project_app.xti b/solution/_Config/PLC/tc_project_app.xti
index 31948d4..67fd43a 100644
--- a/solution/_Config/PLC/tc_project_app.xti
+++ b/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="{4D60DAD6-60EF-E84B-B0BE-6EF31A5C5743}">
+		<Instance Id="#x08502040" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tc_project_app\tc_project_app.tmc" TmcHash="{F0CA46F3-5A8F-BEBD-EF65-56E870AEF64B}">
 			<Name>tc_project_app Instance</Name>
 			<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 			<Contexts>
diff --git a/solution/tc_project_app/GlobalTextList.TcGTLO b/solution/tc_project_app/GlobalTextList.TcGTLO
index bdfe9f1..ab865a8 100644
--- a/solution/tc_project_app/GlobalTextList.TcGTLO
+++ b/solution/tc_project_app/GlobalTextList.TcGTLO
@@ -130,6 +130,11 @@
               <v n="TextDefault">"bGeared"</v>
               <l n="LanguageTexts" t="ArrayList" />
             </o>
+            <o>
+              <v n="TextID">"902"</v>
+              <v n="TextDefault">"bHighTempAxisDisabled"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
             <o>
               <v n="TextID">"948"</v>
               <v n="TextDefault">"bHomed"</v>
@@ -140,6 +145,11 @@
               <v n="TextDefault">"bCommandAborted"</v>
               <l n="LanguageTexts" t="ArrayList" />
             </o>
+            <o>
+              <v n="TextID">"509"</v>
+              <v n="TextDefault">"bHWMaskActive"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
             <o>
               <v n="TextID">"183"</v>
               <v n="TextDefault">"bInterlock"</v>
@@ -155,6 +165,11 @@
               <v n="TextDefault">"bInVeloit"</v>
               <l n="LanguageTexts" t="ArrayList" />
             </o>
+            <o>
+              <v n="TextID">"386"</v>
+              <v n="TextDefault">"bMoving"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
             <o>
               <v n="TextID">"485"</v>
               <v n="TextDefault">"bMovingExtend"</v>
@@ -210,6 +225,16 @@
               <v n="TextDefault">"eHomeDirect"</v>
               <l n="LanguageTexts" t="ArrayList" />
             </o>
+            <o>
+              <v n="TextID">"302"</v>
+              <v n="TextDefault">"eHomeToBlock_Bwd"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
+            <o>
+              <v n="TextID">"1049"</v>
+              <v n="TextDefault">"eHomeToBlock_Fwd"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
             <o>
               <v n="TextID">"198"</v>
               <v n="TextDefault">"eHomeToEncPulse_Bwd"</v>
@@ -315,6 +340,11 @@
               <v n="TextDefault">"fAcceleration"</v>
               <l n="LanguageTexts" t="ArrayList" />
             </o>
+            <o>
+              <v n="TextID">"730"</v>
+              <v n="TextDefault">"fActualTemp"</v>
+              <l n="LanguageTexts" t="ArrayList" />
+            </o>
             <o>
               <v n="TextID">"956"</v>
               <v n="TextDefault">"fDeceleration"</v>
diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib
index ea6826f..007b84c 160000
--- a/solution/tc_project_app/tc_mca_std_lib
+++ b/solution/tc_project_app/tc_mca_std_lib
@@ -1 +1 @@
-Subproject commit ea6826fd491ad4dc0ca947dd09b17d7c7f5f9a1f
+Subproject commit 007b84c823d697288a059130def94adc5165861a

From 751d3eb68eee6f8c2b027d7e8aac6177236bc555 Mon Sep 17 00:00:00 2001
From: Federico Rojas <federico.rojas@ess.eu>
Date: Tue, 12 Dec 2023 12:26:41 +0100
Subject: [PATCH 5/5] update pointer to latest std_lib commit 61eef8

---
 solution/tc_project_app/tc_mca_std_lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib
index 007b84c..61eef8b 160000
--- a/solution/tc_project_app/tc_mca_std_lib
+++ b/solution/tc_project_app/tc_mca_std_lib
@@ -1 +1 @@
-Subproject commit 007b84c823d697288a059130def94adc5165861a
+Subproject commit 61eef8badb9291cefb0dd8698a1d15d366b9a38e