From d04cf0ed4b58d50f7a886ede3be8f63f94b5262b Mon Sep 17 00:00:00 2001
From: Federico Rojas <federicorojas@esss.se>
Date: Fri, 28 Jun 2019 14:46:57 +0200
Subject: [PATCH] Change the fbErrorList to the new fbErrorSystem in MAIN

Update the FB's in ERROR()
---
 solution/tc_project_app/POUs/MAIN.TcPOU       | 45 +++++++++----------
 solution/tc_project_app/tc_mca_std_lib        |  2 +-
 .../tc_project_app/tc_project_app.plcproj     | 12 +++--
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/solution/tc_project_app/POUs/MAIN.TcPOU b/solution/tc_project_app/POUs/MAIN.TcPOU
index ef9925b..ad52d92 100644
--- a/solution/tc_project_app/POUs/MAIN.TcPOU
+++ b/solution/tc_project_app/POUs/MAIN.TcPOU
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.12">
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.17">
   <POU Name="MAIN" Id="{33eb6f49-7781-4211-a70b-87ada6d80cb7}" SpecialFunc="None">
     <Declaration><![CDATA[PROGRAM MAIN
 VAR
@@ -26,11 +26,15 @@ VAR
 	//bOutput28 AT %Q*: BOOL:= TRUE; 
 	
 (******Error Handling********)
-	fbErrorList: FB_ErrorList;
-	//fbEL3214: EL3214;
-	//fbEL1808: EL1808;
-	//fbEL2819: EL2819;
-	//fbEL9410: EL9410;
+	fbErrorSystem: FB_ErrorSystem;
+	//fbEL1018	: EL1018;
+	//fbEL2808	: EL2808;
+	//fbEL5101	: EL5101;
+	//fbEL9505	: EL9505;
+	//fbEL1252	: EL1252;
+	//fbEL9410	: EL9410;
+	//fbEL7037	: EL7037;
+	//fbEK1110	: EK1110;
 	
 END_VAR
 
@@ -56,34 +60,28 @@ END_FOR
         <ST><![CDATA[//
 (****FB containting the log of the errors****)
 //
-fbErrorList(
+fbErrorSystem(
 	En:= TRUE, 
 	bReset:= , 
-	lErrorID:= , 
+	nErrorNum:= , 
 	bACK:= , 
+	bValidSelection:= , 
+	nTableRowIndex:= , 
 	EnO=> , 
-	nNoError=> , 
-	nNoOverflow=> , 
+	nSelectedError=> , 
 	pErrorSystem=> );
 	
 (*call all the necessary instance (input assistance F2 or right click) according to the terminals that you have in your hardware and
  add "TRUE" in the input En, the corresponding number of termianl to the iTerminal_ID and 
-the variable "fbErrorList.pErrorSystem" to the input ErrorSystem in each FB E. g. : 
+the variable "fbErrorSystem.pErrorSystem" to the input ErrorSystem in each FB E. g. : 
 fbEL1808(
 	En:= TRUE, 
-	iTerminal_ID:= 1, 
+	iTerminal_ID:= 01, 
 	ErrorSystem:= fbErrorList.pErrorSystem, 
 	EnO=> , 
-	bDi_1=> , 
-	bDi_2=> , 
-	bDi_3=> , 
-	bDi_4=> , 
-	bDi_5=> , 
-	bDi_6=> , 
-	bDi_7=> , 
-	bDi_8=> , 
 	bError=> );      *)
 //
+
 ]]></ST>
       </Implementation>
     </Action>
@@ -110,11 +108,10 @@ fbEL1808(
     <LineIds Name="MAIN.ERROR">
       <LineId Id="31" Count="0" />
       <LineId Id="10" Count="1" />
-      <LineId Id="2" Count="7" />
+      <LineId Id="34" Count="8" />
       <LineId Id="1" Count="0" />
-      <LineId Id="12" Count="1" />
-      <LineId Id="29" Count="1" />
-      <LineId Id="16" Count="12" />
+      <LineId Id="12" Count="0" />
+      <LineId Id="44" Count="8" />
       <LineId Id="14" Count="0" />
       <LineId Id="32" Count="1" />
     </LineIds>
diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib
index 5eb56db..e52c5ad 160000
--- a/solution/tc_project_app/tc_mca_std_lib
+++ b/solution/tc_project_app/tc_mca_std_lib
@@ -1 +1 @@
-Subproject commit 5eb56db806fd52bae29f59bfb59f2a42328fb61d
+Subproject commit e52c5ad7be5ffebbfa3ce4f16908e4597f0e71ac
diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj
index 373586a..627dc92 100644
--- a/solution/tc_project_app/tc_project_app.plcproj
+++ b/solution/tc_project_app/tc_project_app.plcproj
@@ -36,7 +36,8 @@
     </Compile>
     <Compile Include="tc_mca_std_lib\DUTs\ST_AxisStatus.TcDUT">
       <SubType>Code</SubType>
-    </Compile>    <Compile Include="tc_mca_std_lib\DUTs\ST_AxisStruct.TcDUT">
+    </Compile>
+    <Compile Include="tc_mca_std_lib\DUTs\ST_AxisStruct.TcDUT">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="tc_mca_std_lib\GVLs\GVL.TcGVL">
@@ -57,16 +58,19 @@
     <Compile Include="tc_mca_std_lib\POUs\ErrorHandling\DUT_ErrorState.TcDUT">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="tc_mca_std_lib\POUs\ErrorHandling\DUT_TerminalError.TcDUT">
+    <Compile Include="tc_mca_std_lib\POUs\ErrorHandling\FB_ErrorSystem.TcPOU">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="tc_mca_std_lib\POUs\ErrorHandling\FB_ErrorList.TcPOU">
+    <Compile Include="tc_mca_std_lib\POUs\ErrorHandling\FB_GenericError.TcPOU">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="tc_mca_std_lib\POUs\ErrorHandling\FB_NC_Error.TcPOU">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="tc_mca_std_lib\POUs\ErrorHandling\FB_TerminalError.TcPOU">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="tc_mca_std_lib\POUs\ErrorHandling\GVL_ErrorSystem.TcGVL">
+    <Compile Include="tc_mca_std_lib\POUs\ErrorHandling\ST_ErrorEntry.TcDUT">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="tc_mca_std_lib\POUs\ErrorHandling\ST_ErrorSystem.TcDUT">