From a5fa02873593c2566cecde057cd4b1e401d0216a Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Mon, 2 Mar 2020 16:07:10 +0100 Subject: [PATCH 1/7] Delete all error handling from MAIN Delete the action ERROR() Delete all the variable section for Error Handling in MAIN --- solution/tc_project_app/POUs/MAIN.TcPOU | 74 +------------------------ 1 file changed, 2 insertions(+), 72 deletions(-) diff --git a/solution/tc_project_app/POUs/MAIN.TcPOU b/solution/tc_project_app/POUs/MAIN.TcPOU index 2621b5e..3ff0212 100644 --- a/solution/tc_project_app/POUs/MAIN.TcPOU +++ b/solution/tc_project_app/POUs/MAIN.TcPOU @@ -26,19 +26,6 @@ VAR //bOutput24 AT %Q*: BOOL:= TRUE; //bOutput28 AT %Q*: BOOL:= TRUE; -(******Error Handling********) - fbErrorSystem: FB_ErrorSystem; - aFbAxesError: ARRAY [1..gvl_app.axisNum] OF FB_NC_Error; - - //fbEL1018 : EL1018; - //fbEL2808 : EL2808; - //fbEL5101 : EL5101; - //fbEL9505 : EL9505; - //fbEL1252 : EL1252; - //fbEL9410 : EL9410; - //fbEL7037 : EL7037; - //fbEK1110 : EK1110; - (******Startup, Shutdown and UPS********) fbUPS : FB_S_UPS_CX51x0; eUpsMode : E_S_UPS_Mode := eSUPS_WrPersistData_Shutdown; @@ -59,8 +46,7 @@ END_VAR]]> +AXES();]]> @@ -87,46 +73,6 @@ ELSIF eGlobalSUpsState <> eSUPS_PowerOK THEN END_IF]]> - - - , - nSelectedError=> , - pErrorSystem=> ); - - -FOR GVL.iAxis:=1 TO gvl_app.axisNum DO - aFbAxesError[gvl.iAxis](EN:=TRUE, - nNC_ErrorID:= gvl.axes[gvl.iAxis].status.nErrorID, - nNC_AxisID:=gvl.axes[gvl.iAxis].Axis.NcToPlc.AxisId, - ErrorSystem:= fbErrorSystem.pErrorSystem); -END_FOR - - - -(*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 "fbErrorSystem.pErrorSystem" to the input ErrorSystem in each FB E. g. : -fbEL1808( - En:= TRUE, - iTerminal_ID:= 01, - ErrorSystem:= fbErorSystem.pErrorSystem, - EnO=> , - bError=> ); - *) - -]]> - - - + @@ -287,22 +233,6 @@ END_FOR]]> - - - - - - - - - - - - - - - - From 9e3a609823c989ef2f88bda321821bdbacb6672e Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Mon, 2 Mar 2020 16:08:34 +0100 Subject: [PATCH 2/7] Add commits in tc_mca_std_lib for deleting all the error handling files --- 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 852ea37..4f0c125 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit 852ea37aa8d1aadfe0f2b84fd462c1f30aadd492 +Subproject commit 4f0c125af07cc4cb5e593c32de2fbd66c9e9ebd4 From e29e5a6fd02abdca78e0c40f53f2eb4294aa2c7c Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Mon, 2 Mar 2020 16:16:30 +0100 Subject: [PATCH 3/7] Delete the directories with all the error handling files. New tree structure --- .../tc_project_app/tc_project_app.plcproj | 121 ------------------ 1 file changed, 121 deletions(-) diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index b5d34ae..f8a5867 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -71,117 +71,6 @@ Code - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - Code @@ -242,18 +131,8 @@ - - - - - - - - - - From aaea8a67a33c074e14a25a03a8cc8a70603c5173 Mon Sep 17 00:00:00 2001 From: Dominic Oram Date: Mon, 2 Mar 2020 16:29:07 +0000 Subject: [PATCH 4/7] Update submodule --- 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 852ea37..3897755 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit 852ea37aa8d1aadfe0f2b84fd462c1f30aadd492 +Subproject commit 3897755dd750917c8fbeafa3143ccdbdd35af823 From f42a22cbe0fe7af557107055d598d240ef8df7c4 Mon Sep 17 00:00:00 2001 From: kleines Date: Mon, 2 Mar 2020 17:31:50 +0100 Subject: [PATCH 5/7] deleted uncommented code in GVL_APP --- solution/tc_project_app/GVLs/GVL_APP.TcGVL | 1 - 1 file changed, 1 deletion(-) diff --git a/solution/tc_project_app/GVLs/GVL_APP.TcGVL b/solution/tc_project_app/GVLs/GVL_APP.TcGVL index e125049..c284299 100644 --- a/solution/tc_project_app/GVLs/GVL_APP.TcGVL +++ b/solution/tc_project_app/GVLs/GVL_APP.TcGVL @@ -8,7 +8,6 @@ END_VAR VAR_GLOBAL CONSTANT axisNum : UINT:=0; - //axisCoupleMax : UINT:=4; END_VAR]]> \ No newline at end of file From 597881796f656d8af937a9bc1828acf08627fea5 Mon Sep 17 00:00:00 2001 From: Dominic Oram Date: Mon, 2 Mar 2020 16:35:29 +0000 Subject: [PATCH 6/7] Update submodule --- 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 3897755..50d6980 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit 3897755dd750917c8fbeafa3143ccdbdd35af823 +Subproject commit 50d6980aa54ae96c813081b03ace04c3d82003f6 From 71da3cce157283895458fcd5ee84ed17d0e7c699 Mon Sep 17 00:00:00 2001 From: Dominic Oram Date: Mon, 2 Mar 2020 17:12:31 +0000 Subject: [PATCH 7/7] Updated submodule --- 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 50d6980..85f11c0 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit 50d6980aa54ae96c813081b03ace04c3d82003f6 +Subproject commit 85f11c08bc807bda1e02aa5c635a789d355da20c