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 diff --git a/solution/_Config/PLC/tc_project_app.xti b/solution/_Config/PLC/tc_project_app.xti index 4d9f5b7..efb25b2 100644 --- a/solution/_Config/PLC/tc_project_app.xti +++ b/solution/_Config/PLC/tc_project_app.xti @@ -1,11 +1,7 @@ -<<<<<<< Updated upstream - -======= - ->>>>>>> Stashed changes + tc_project_app Instance {08500001-0000-0000-F000-000000000064} diff --git a/solution/tc_project_app/DUTs/E_CPUType.TcDUT b/solution/tc_project_app/DUTs/E_CPUType.TcDUT index 7ca656f..23f0f1a 100644 --- a/solution/tc_project_app/DUTs/E_CPUType.TcDUT +++ b/solution/tc_project_app/DUTs/E_CPUType.TcDUT @@ -1,5 +1,5 @@  - + - + - + @@ -25,6 +25,11 @@ "%2.2f" + + "17" + "%2.3f" + + "543" "%2.4f" @@ -65,6 +70,11 @@ "actVel" + + "414" + "Allowed pressure out of range time(s)" + + "110" "AXESMAX" @@ -105,6 +115,11 @@ "bEnabled" + + "394" + "bEnableStopWithAnyLS" + + "941" "bError" @@ -215,6 +230,11 @@ "Bwd Enable" + + "974" + "Current pressure value (bar)" + + "986" "ehomeDirect" @@ -280,6 +300,11 @@ "Elapsed time" + + "87" + "Elapsed time (ms)" + + "104" "ENABLE" @@ -295,6 +320,21 @@ "ENABLE FW" + + "1009" + "End switches simulation" + + + + "554" + "EndSwitchBwd" + + + + "1084" + "EndSwitchFwd" + + "109" "English" @@ -415,6 +455,11 @@ "halt" + + "347" + "High pressure limit (bar)" + + "123" "HOME" @@ -460,6 +505,11 @@ "jogFw" + + "1195" + "Label" + + "19" "Limit switches simulation" @@ -475,6 +525,11 @@ "LimitFwd" + + "961" + "Low pressure limit (bar)" + + "298" "masterGear" @@ -615,6 +670,11 @@ "stop" + + "978" + "Stop at any Limit Swtich" + + "108" "Test Language" 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 @@  - + + + + + + + + + \ No newline at end of file diff --git a/solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU b/solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU index f181670..2e30374 100644 --- a/solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU +++ b/solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU @@ -1,5 +1,5 @@  - + diff --git a/solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU b/solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU index d374ed2..9dbd47c 100644 --- a/solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU +++ b/solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU @@ -1,13 +1,24 @@  - + - - + diff --git a/solution/tc_project_app/PlcTask.TcTTO b/solution/tc_project_app/PlcTask.TcTTO index edda272..ee37a7a 100644 --- a/solution/tc_project_app/PlcTask.TcTTO +++ b/solution/tc_project_app/PlcTask.TcTTO @@ -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 e1dd82c..0333116 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 @@ -37,6 +37,9 @@ Code + + Code + Code @@ -73,6 +76,9 @@ Code + + Code + Code