From 82f75d9d6a2d5b781a4b87193fe5ec9919b9ced0 Mon Sep 17 00:00:00 2001 From: kleines Date: Wed, 16 Nov 2022 14:14:28 +0100 Subject: [PATCH 1/4] added bInvelocity to VISU --- solution.sln | 4 +-- solution/_Config/PLC/tc_project_app.xti | 2 +- solution/tc_project_app/GlobalTextList.TcGTLO | 30 +++++++++++++++++ .../Visualization Manager.TcVMO | 32 +++++++++---------- solution/tc_project_app/tc_mca_std_lib | 2 +- .../tc_project_app/tc_project_app.plcproj | 2 +- 6 files changed, 51 insertions(+), 21 deletions(-) diff --git a/solution.sln b/solution.sln index 60113c2..2694336 100644 --- a/solution.sln +++ b/solution.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# TcXaeShell Solution File, Format Version 11.00 -VisualStudioVersion = 15.0.28307.1300 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{B1E792BE-AA5F-4E3C-8C82-674BF9C0715B}") = "solution", "solution\solution.tsproj", "{9CF97348-B9D3-4938-B1F2-5F0B0B6AA66A}" EndProject diff --git a/solution/_Config/PLC/tc_project_app.xti b/solution/_Config/PLC/tc_project_app.xti index 30060c1..c0d4d86 100644 --- a/solution/_Config/PLC/tc_project_app.xti +++ b/solution/_Config/PLC/tc_project_app.xti @@ -1,7 +1,7 @@ - + tc_project_app Instance {08500001-0000-0000-F000-000000000064} diff --git a/solution/tc_project_app/GlobalTextList.TcGTLO b/solution/tc_project_app/GlobalTextList.TcGTLO index 543a845..bdfe9f1 100644 --- a/solution/tc_project_app/GlobalTextList.TcGTLO +++ b/solution/tc_project_app/GlobalTextList.TcGTLO @@ -10,6 +10,11 @@ " LocalMode" + + "972" + " bLocalMode" + + "587" "%1d" @@ -140,6 +145,16 @@ "bInterlock" + + "512" + "bInVelocity" + + + + "541" + "bInVeloit" + + "485" "bMovingExtend" @@ -190,6 +205,11 @@ "ehomeDirect" + + "350" + "eHomeDirect" + + "198" "eHomeToEncPulse_Bwd" @@ -255,6 +275,11 @@ "English" + + "1004" + "eReadParameter" + + "939" "errID" @@ -365,6 +390,11 @@ "HOME" + + "568" + "Home" + + "169" "homeDirect" diff --git a/solution/tc_project_app/Visualization Manager.TcVMO b/solution/tc_project_app/Visualization Manager.TcVMO index 51a9bf2..516c2d1 100644 --- a/solution/tc_project_app/Visualization Manager.TcVMO +++ b/solution/tc_project_app/Visualization Manager.TcVMO @@ -45,10 +45,10 @@ FB_Init c98701bd-1e9f-450a-a2a8-a2474d536f2e - FB_Exit - 0be1b9ab-e8eb-4b33-b803-109abb46bde4 FB_Reinit 5b6e372a-a69d-40e8-aef7-f470b7c53d95 + FB_Exit + 0be1b9ab-e8eb-4b33-b803-109abb46bde4 "NotImportant" {aa8b7e42-e967-427f-8f2e-f00f9d706470} @@ -466,34 +466,34 @@ ExecuteLooseCapture 4e2884cd-dc97-4120-914c-87a83e618f1f + ExecuteMouseUp + 57eea9a5-15d9-4269-bb8d-9fee5420cdb2 Init e61a0910-39b6-4bcc-9a64-fcab62230628 FB_Exit e6e1ea47-0811-4b03-9888-d0564361e0d6 ExecuteMouseDblClick a517a0ac-170b-4df4-b289-55dcb57628ed - ExecuteMouseDown - 94bab392-b395-4c03-9d0e-5738d11bd021 - ExecuteMouseUp - 57eea9a5-15d9-4269-bb8d-9fee5420cdb2 - ExecuteMouseEnter - 569205fa-533b-4fc2-8d51-21ccab693305 - FB_Reinit - 97933c03-0169-4afe-ac83-de892204e120 GetElementInfo f64cb89f-3016-4fba-85f5-02efcd4282c1 - abstrGetDefaultCursor - 25718998-50a9-408d-8b3f-20a55e2cc784 + ExecuteMouseDown + 94bab392-b395-4c03-9d0e-5738d11bd021 + FB_Reinit + 97933c03-0169-4afe-ac83-de892204e120 + Initialize + 6946d6e0-129f-4425-b8b0-ef98281a99e9 + ExecuteMouseMove + 58fc221c-be14-4e34-871e-a118f8ba9539 ExecuteDialogClosed f08d08b6-e70c-4bef-a136-38845bd246d8 ExecuteKeyUp 7403635b-2725-4f00-93d4-e0dd125959de ExecuteKeyDown 9649ecda-3794-4d6b-a8a7-71e528d9d170 - ExecuteMouseMove - 58fc221c-be14-4e34-871e-a118f8ba9539 - Initialize - 6946d6e0-129f-4425-b8b0-ef98281a99e9 + abstrGetDefaultCursor + 25718998-50a9-408d-8b3f-20a55e2cc784 + ExecuteMouseEnter + 569205fa-533b-4fc2-8d51-21ccab693305 ExecuteMouseLeave 3bacea68-55b4-4764-928e-e69910299932 FB_Init diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib index da32442..9a70637 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit da324425856e36e3c3bb2e1d80c5c437505cbfab +Subproject commit 9a70637f42c491d57962517391a5617e05045cf1 diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index 3399138..f688869 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -93,7 +93,7 @@ Code - Code + Code Code From 934bca647b2a14b47efdd2d7a90467388f66c385 Mon Sep 17 00:00:00 2001 From: kleines Date: Wed, 16 Nov 2022 17:57:58 +0100 Subject: [PATCH 2/4] Added changes to mc_std_lib --- solution/_Config/PLC/tc_project_app.xti | 2 +- solution/tc_project_app/tc_mca_std_lib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/solution/_Config/PLC/tc_project_app.xti b/solution/_Config/PLC/tc_project_app.xti index c0d4d86..31948d4 100644 --- a/solution/_Config/PLC/tc_project_app.xti +++ b/solution/_Config/PLC/tc_project_app.xti @@ -1,7 +1,7 @@ - + tc_project_app Instance {08500001-0000-0000-F000-000000000064} diff --git a/solution/tc_project_app/tc_mca_std_lib b/solution/tc_project_app/tc_mca_std_lib index 9a70637..de82231 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit 9a70637f42c491d57962517391a5617e05045cf1 +Subproject commit de822316c2787d3971db8df6e9df98d645b582d5 From 98dcca4a07de51fee395ef685356ce5495779f82 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Fri, 3 Feb 2023 11:28:28 +0100 Subject: [PATCH 3/4] Update pointer to latest commit of mca_std_lib 009c6 --- 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 de82231..009c682 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit de822316c2787d3971db8df6e9df98d645b582d5 +Subproject commit 009c682376e7d4e9de2e3147ca146b5471bff2d4 From 886c7e387f68c673c209ae94d6a069b05db85fa6 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Fri, 3 Feb 2023 15:09:39 +0100 Subject: [PATCH 4/4] Revert uncessary change in solution.sln. Vidaul studio version --- solution.sln | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solution.sln b/solution.sln index 2694336..60113c2 100644 --- a/solution.sln +++ b/solution.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 +# TcXaeShell Solution File, Format Version 11.00 +VisualStudioVersion = 15.0.28307.1300 MinimumVisualStudioVersion = 10.0.40219.1 Project("{B1E792BE-AA5F-4E3C-8C82-674BF9C0715B}") = "solution", "solution\solution.tsproj", "{9CF97348-B9D3-4938-B1F2-5F0B0B6AA66A}" EndProject