From 3d3d3aebfbc486277ac80acfb448f32397e67c3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20B=C3=B6gershausen?= Date: Mon, 17 Oct 2022 10:13:03 +0200 Subject: [PATCH 1/6] Ignore LineIDs.dbg --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 83f035e..e5ef5ae 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ UpgradeLog.htm _Boot/ _CompileInfo/ _Libraries/ +solution/tc_project_app/LineIDs.dbg LineIDs.dbg logs.0* solution/TrialLicense.tclrs From df503583e11dbaf86f1293564b2c2a710d99ba92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20B=C3=B6gershausen?= Date: Mon, 17 Oct 2022 10:14:55 +0200 Subject: [PATCH 2/6] Remove LineIDs from files --- .../Applications/Application_Template.TcPOU | 4 ---- .../Application_Specific/Axes/Axis_Template.TcPOU | 12 ------------ .../Axes/Pneumatics_Template.TcPOU | 12 ------------ 3 files changed, 28 deletions(-) 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 3c265a4..d653e82 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 @@ -10,9 +10,5 @@ END_VAR - - - - \ 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 32ccddb..22aac43 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 @@ -24,17 +24,5 @@ END_IF*) Eg. GVL.astAxes[x].stControl.bInterlockFwd := NOT bInterlockFwdOK;*) ]]> - - - - - - - - - - - - \ No newline at end of file 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 7192ca5..d374ed2 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 @@ -17,17 +17,5 @@ END_VAR ]]> - - - - - - - - - - - - \ No newline at end of file From 7eda64fa5ff5adb2450adbf292bda84809e36e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20B=C3=B6gershausen?= Date: Mon, 17 Oct 2022 10:20:06 +0200 Subject: [PATCH 3/6] Summary :twincat_version_manager.py: Check .xti files for correct version --- twincat_version_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/twincat_version_manager.py b/twincat_version_manager.py index 77484bb..be19ad1 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.11", "**/*.tsproj": "3.1.4024.32"} +CORRECT_VERSIONS = {"**/*.Tc*": "3.1.4024.11", "**/*.tsproj": "3.1.4024.32", "**/*.xti": "3.1.4024.32"} def check_versions(): From e7a5394c0232e51d083875d1686d7224f647fe66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20B=C3=B6gershausen?= Date: Mon, 17 Oct 2022 10:20:42 +0200 Subject: [PATCH 4/6] update TwinCAT version in solution/_Config/NC/NC.xti --- solution/_Config/NC/NC.xti | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solution/_Config/NC/NC.xti b/solution/_Config/NC/NC.xti index 32cccdf..ba2dbbd 100644 --- a/solution/_Config/NC/NC.xti +++ b/solution/_Config/NC/NC.xti @@ -1,5 +1,5 @@ - + NC-Task 1 SAF From c026a0bc6c1f3cd96dd117df6862c6784bd782e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20B=C3=B6gershausen?= Date: Mon, 17 Oct 2022 10:22:10 +0200 Subject: [PATCH 5/6] Fix OPC attributes in GVL_APP.TcGVL --- solution/tc_project_app/GVLs/GVL_APP.TcGVL | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/solution/tc_project_app/GVLs/GVL_APP.TcGVL b/solution/tc_project_app/GVLs/GVL_APP.TcGVL index a9243cd..b8e952e 100644 --- a/solution/tc_project_app/GVLs/GVL_APP.TcGVL +++ b/solution/tc_project_app/GVLs/GVL_APP.TcGVL @@ -3,12 +3,10 @@ From 99f89c3bc8788ddad750683b743cdd6c995b6031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20B=C3=B6gershausen?= Date: Mon, 17 Oct 2022 10:22:46 +0200 Subject: [PATCH 6/6] OOP: Introduce interfaces for application specific code Add interfaces for application-specific (or non application specific) code execution per axis. Add an array of interfaces and call them. Changes to be committed: modified: solution/tc_project_app/POUs/Application_Specific/Axes/Axis_Template.TcPOU modified: solution/tc_project_app/POUs/MAIN.TcPOU modified: solution/tc_project_app/Visualization Manager.TcVMO modified: solution/tc_project_app/tc_project_app.plcproj --- .../Axes/Axis_Template.TcPOU | 6 +- solution/tc_project_app/POUs/MAIN.TcPOU | 38 +++- .../Visualization Manager.TcVMO | 4 +- .../tc_project_app/tc_project_app.plcproj | 213 ++++++++++++++++-- 4 files changed, 222 insertions(+), 39 deletions(-) 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 22aac43..43513fc 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 @@ -8,8 +8,7 @@ VAR //Hardware interlocks //bInterlockFwdOK AT %I*: BOOL; -END_VAR -]]> +END_VAR]]> +Eg. GVL.astAxes[x].stControl.bInterlockFwd := NOT bInterlockFwdOK;*)]]> \ No newline at end of file diff --git a/solution/tc_project_app/POUs/MAIN.TcPOU b/solution/tc_project_app/POUs/MAIN.TcPOU index a97fe32..96e9c9d 100644 --- a/solution/tc_project_app/POUs/MAIN.TcPOU +++ b/solution/tc_project_app/POUs/MAIN.TcPOU @@ -4,6 +4,7 @@ +PROG(); +AXES();]]> - @@ -74,7 +85,18 @@ END_IF]]> - + diff --git a/solution/tc_project_app/Visualization Manager.TcVMO b/solution/tc_project_app/Visualization Manager.TcVMO index 20054b0..51a9bf2 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_Reinit - 5b6e372a-a69d-40e8-aef7-f470b7c53d95 FB_Exit 0be1b9ab-e8eb-4b33-b803-109abb46bde4 + FB_Reinit + 5b6e372a-a69d-40e8-aef7-f470b7c53d95 "NotImportant" {aa8b7e42-e967-427f-8f2e-f00f9d706470} diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index aa51c7f..3399138 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -41,6 +41,33 @@ Code + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + + + Code + Code @@ -65,6 +92,9 @@ Code + + Code + Code @@ -98,34 +128,10 @@ Code - - Code - - - Code - Code - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - + Code @@ -156,6 +162,9 @@ Code Visualization Manager.TcVMO + + Code + Code Visualization Manager.TcVMO @@ -170,6 +179,7 @@ + @@ -276,9 +286,162 @@ + + CAA Callback Extern, * (CAA Technical Workgroup) + + + CAA Memory Block Manager Extern, * (CAA Technical Workgroup) + + + CAA Ressource Manager Extern, * (CAA Technical Workgroup) + + + CAA Types Extern, * (CAA Technical Workgroup) + + + CmpApp, * (System) + + + CmpBitmapPool, * (System) + + + CmpDynamicText, * (System) + + + CmpEventMgr, * (System) + + + CmpLog, * (System) + + + CmpSchedule, * (System) + + + CmpTargetVisu, * (System) + + + CmpVisuHandler, * (System) + + + Collections, * (System) + + + Component Manager, * (System) + + + FloatingPointUtils, * (System) + + + Tc2_Standard, * (Beckhoff Automation GmbH) + + + Tc2_Standard, * (Beckhoff Automation GmbH) + + + StringUtils, * (System) + + + SysCpuHandling, * (System) + + + SysDir, * (System) + + + SysFile, * (System) + + + SysMem, * (System) + + + SysProcess, * (System) + + + SysShm, * (System) + + + SysTarget, * (System) + + + VisuElemBase, * (System) + + + VisuElemEventTable, * (System) + + + VisuElemMeter, * (System) + + + VisuElems, * (System) + + + VisuElemsSpecialControls, * (System) + + + VisuElemsWinControls, * (System) + + + VisuElemTextEditor, * (System) + + + VisuInputs, * (System) + + + VisuInputs, * (System) + + + VisuNativeControl, * (System) + + + SysTime, * (System) + + + SysTimeCore, * (System) + + + SysTimeRtc, * (System) + + + Tc2_Drive, * (Beckhoff Automation GmbH) + + + Tc2_EtherCAT, * (Beckhoff Automation GmbH) + + + Tc2_IoFunctions, * (Beckhoff Automation GmbH) + + + Tc2_Math, * (Beckhoff Automation GmbH) + Tc2_MC2, 3.3.48.0 (Beckhoff Automation GmbH) + + Tc2_MC2_Drive, * (Beckhoff Automation GmbH) + + + Tc2_Standard, * (Beckhoff Automation GmbH) + + + Tc2_SUPS, * (Beckhoff Automation GmbH) + + + Tc2_System, * (Beckhoff Automation GmbH) + + + Tc2_Utilities, * (Beckhoff Automation GmbH) + + + Tc3_MC2_AdvancedHoming, * (Beckhoff Automation GmbH) + + + Tc3_Module, * (Beckhoff Automation GmbH) + + + Util, * (System) + + + VisuDialogs, * (System) +