From abb676b70be4295aea994230a51f8657f2a74270 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Mon, 15 Jul 2024 16:58:57 +0200 Subject: [PATCH 1/3] Delete Product version from all files --- 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 | 62 +++++++++---------- .../tc_project_app/tc_project_app.plcproj | 26 ++++---- 9 files changed, 51 insertions(+), 51 deletions(-) diff --git a/solution/tc_project_app/GVLs/GVL_APP.TcGVL b/solution/tc_project_app/GVLs/GVL_APP.TcGVL index 1f59157..17eaa46 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 d1201aa..78425b1 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 516c2d1..c162438 100644 --- a/solution/tc_project_app/Visualization Manager.TcVMO +++ b/solution/tc_project_app/Visualization Manager.TcVMO @@ -1,5 +1,5 @@  - + @@ -43,12 +43,12 @@ + FB_Exit + 0be1b9ab-e8eb-4b33-b803-109abb46bde4 FB_Init c98701bd-1e9f-450a-a2a8-a2474d536f2e FB_Reinit 5b6e372a-a69d-40e8-aef7-f470b7c53d95 - FB_Exit - 0be1b9ab-e8eb-4b33-b803-109abb46bde4 "NotImportant" {aa8b7e42-e967-427f-8f2e-f00f9d706470} @@ -464,42 +464,42 @@ - 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 - 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 abstrGetDefaultCursor 25718998-50a9-408d-8b3f-20a55e2cc784 + ExecuteDialogClosed + f08d08b6-e70c-4bef-a136-38845bd246d8 + ExecuteKeyDown + 9649ecda-3794-4d6b-a8a7-71e528d9d170 + ExecuteKeyUp + 7403635b-2725-4f00-93d4-e0dd125959de + ExecuteLooseCapture + 4e2884cd-dc97-4120-914c-87a83e618f1f + ExecuteMouseClick + cd348bda-7eaf-4dfe-8c4b-bf9b71e5b10c + ExecuteMouseDblClick + a517a0ac-170b-4df4-b289-55dcb57628ed + ExecuteMouseDown + 94bab392-b395-4c03-9d0e-5738d11bd021 ExecuteMouseEnter 569205fa-533b-4fc2-8d51-21ccab693305 ExecuteMouseLeave 3bacea68-55b4-4764-928e-e69910299932 + ExecuteMouseMove + 58fc221c-be14-4e34-871e-a118f8ba9539 + ExecuteMouseUp + 57eea9a5-15d9-4269-bb8d-9fee5420cdb2 + FB_Exit + e6e1ea47-0811-4b03-9888-d0564361e0d6 FB_Init f37e1250-9b48-45ca-810e-c192ea9440ec - ExecuteMouseClick - cd348bda-7eaf-4dfe-8c4b-bf9b71e5b10c + FB_Reinit + 97933c03-0169-4afe-ac83-de892204e120 + GetElementInfo + f64cb89f-3016-4fba-85f5-02efcd4282c1 + Init + e61a0910-39b6-4bcc-9a64-fcab62230628 + Initialize + 6946d6e0-129f-4425-b8b0-ef98281a99e9 "NotImportant" {073ee466-cf0a-4c8b-ba92-64f671516699} diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index b8d1462..b56e613 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -16,7 +16,7 @@ false - true + false false true @@ -445,8 +445,8 @@ - - + + "<ProjectRoot>" {192FAD59-8248-4824-A8DE-9177C94C195A} @@ -516,16 +516,16 @@ - - - System.Boolean - System.Collections.Hashtable - System.Int32 - {af9bafe2-ba31-4b15-a2b9-48a0f2cd09fb} - {54dd0eac-a6d8-46f2-8c27-2f43c7e49861} - System.String - - + + + System.Boolean + System.Collections.Hashtable + System.Int32 + {af9bafe2-ba31-4b15-a2b9-48a0f2cd09fb} + {54dd0eac-a6d8-46f2-8c27-2f43c7e49861} + System.String + + \ No newline at end of file From 7ab40ac3db8e49d0c7c906bfbabd9a0bf7aae2c8 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Mon, 15 Jul 2024 16:59:38 +0200 Subject: [PATCH 2/3] Comment the pipeline call of twincat_version_manager.py --- bitbucket-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 3412348..6869155 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -6,8 +6,8 @@ pipelines: - step: script: - git submodule update --init - - python twincat_version_manager.py - python check_fix_white_space.py - ./check_no_lineids.sh - ./check_code_before_sq_brackets.sh + #- python twincat_version_manager.py From 2eec180723693052b99595f36d799d8f5f915927 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Mon, 15 Jul 2024 17:00:32 +0200 Subject: [PATCH 3/3] Update pointer of tc_mca_lib to commit 9d09ac --- 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 a44a596..ff29033 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit a44a59664c0a8f855c0909b8e758e71c676d3c56 +Subproject commit ff29033a16fa00b26ad0abb6665870397c9d09ac