From ce8d745ccafedad8f429cec44f6787bce06e4f8d Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Tue, 16 Aug 2022 15:24:12 +0200 Subject: [PATCH] Update all files to new build version. To 3024.11 and 3024.32 --- solution/Licenses/ReadMe_licenses.txt | 5 ---- solution/_Config/PLC/tc_project_app.xti | 4 +-- solution/solution.tsproj | 4 +-- solution/tc_project_app/GVLs/GVL_APP.TcGVL | 2 +- solution/tc_project_app/GlobalTextList.TcGTLO | 2 +- .../Applications/Application_Template.TcPOU | 2 +- .../Axes/Axis_Template.TcPOU | 2 +- .../Axes/Pneumatics_Template.TcPOU | 2 +- solution/tc_project_app/POUs/MAIN.TcPOU | 2 +- solution/tc_project_app/PlcTask.TcTTO | 2 +- .../Visualization Manager.TcVMO | 28 +++++++++---------- solution/tc_project_app/tc_mca_std_lib | 2 +- .../tc_project_app/tc_project_app.plcproj | 11 ++++++++ twincat_version_manager.py | 2 +- 14 files changed, 38 insertions(+), 32 deletions(-) delete mode 100644 solution/Licenses/ReadMe_licenses.txt diff --git a/solution/Licenses/ReadMe_licenses.txt b/solution/Licenses/ReadMe_licenses.txt deleted file mode 100644 index 1cc9be8..0000000 --- a/solution/Licenses/ReadMe_licenses.txt +++ /dev/null @@ -1,5 +0,0 @@ -Copy and paste in this folder the licenses contained inside the Beckhoff CPU in the path: - -C:\TwinCAT\3.1\Target\License - -Thank you \ No newline at end of file diff --git a/solution/_Config/PLC/tc_project_app.xti b/solution/_Config/PLC/tc_project_app.xti index 9067711..2e97b49 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/solution.tsproj b/solution/solution.tsproj index 4bf7c31..f495754 100644 --- a/solution/solution.tsproj +++ b/solution/solution.tsproj @@ -1,8 +1,8 @@ - + - + diff --git a/solution/tc_project_app/GVLs/GVL_APP.TcGVL b/solution/tc_project_app/GVLs/GVL_APP.TcGVL index f8c5309..da28880 100644 --- a/solution/tc_project_app/GVLs/GVL_APP.TcGVL +++ b/solution/tc_project_app/GVLs/GVL_APP.TcGVL @@ -1,5 +1,5 @@  - + - + 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 dbf45fb..3c265a4 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 @@ -1,5 +1,5 @@  - + - + - + - + - + 10000 diff --git a/solution/tc_project_app/Visualization Manager.TcVMO b/solution/tc_project_app/Visualization Manager.TcVMO index 8dc78a2..20054b0 100644 --- a/solution/tc_project_app/Visualization Manager.TcVMO +++ b/solution/tc_project_app/Visualization Manager.TcVMO @@ -1,5 +1,5 @@  - + @@ -58,7 +58,7 @@ 7 4096 "1002 0004" - "1.0.0.4" + "1.0.0.6" {cb73a13e-6ccc-4bc6-8859-f5aa98bb116b} @@ -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 - GetElementInfo - f64cb89f-3016-4fba-85f5-02efcd4282c1 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 - Initialize - 6946d6e0-129f-4425-b8b0-ef98281a99e9 - ExecuteMouseMove - 58fc221c-be14-4e34-871e-a118f8ba9539 + GetElementInfo + f64cb89f-3016-4fba-85f5-02efcd4282c1 + abstrGetDefaultCursor + 25718998-50a9-408d-8b3f-20a55e2cc784 ExecuteDialogClosed f08d08b6-e70c-4bef-a136-38845bd246d8 ExecuteKeyUp 7403635b-2725-4f00-93d4-e0dd125959de ExecuteKeyDown 9649ecda-3794-4d6b-a8a7-71e528d9d170 - abstrGetDefaultCursor - 25718998-50a9-408d-8b3f-20a55e2cc784 - ExecuteMouseEnter - 569205fa-533b-4fc2-8d51-21ccab693305 + ExecuteMouseMove + 58fc221c-be14-4e34-871e-a118f8ba9539 + Initialize + 6946d6e0-129f-4425-b8b0-ef98281a99e9 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 183b1d2..1ab496b 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit 183b1d296f3a8623e51d96be7117b06732912475 +Subproject commit 1ab496b552ae6571bee1cd2cc9c8f70db006c7fc diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index 0c11005..4e77103 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -16,6 +16,7 @@ false + true @@ -118,6 +119,15 @@ Code + + Code + + + Code + + + Code + Code @@ -157,6 +167,7 @@ + diff --git a/twincat_version_manager.py b/twincat_version_manager.py index 697ca50..77484bb 100644 --- a/twincat_version_manager.py +++ b/twincat_version_manager.py @@ -2,7 +2,7 @@ import glob import xml.etree.ElementTree as ET VERSION_TAGS = {"**/*.Tc*": "ProductVersion", "**/*.tsproj": "TcVersion"} -CORRECT_VERSIONS = {"**/*.Tc*": "3.1.4024.5", "**/*.tsproj": "3.1.4024.11"} +CORRECT_VERSIONS = {"**/*.Tc*": "3.1.4024.11", "**/*.tsproj": "3.1.4024.32"} def check_versions():