From cf3c760290234a1e6be293296041f3a3b7dc6f11 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Wed, 9 Dec 2020 15:18:00 +0100 Subject: [PATCH 1/9] Delete the action PROG() from the solution --- solution/solution.tsproj | 15 +++++++++++++-- solution/tc_project_app/POUs/MAIN.TcPOU | 10 ---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/solution/solution.tsproj b/solution/solution.tsproj index 66086ff..6c26f56 100644 --- a/solution/solution.tsproj +++ b/solution/solution.tsproj @@ -1,5 +1,5 @@ - + @@ -16,7 +16,7 @@ tc_project_app Instance {08500001-0000-0000-F000-000000000064} - + PlcTask Outputs MAIN.bOutput1 @@ -24,6 +24,17 @@ BOOL + + + 0 + PlcTask + + #x02010040 + + 20 + 10000000 + + diff --git a/solution/tc_project_app/POUs/MAIN.TcPOU b/solution/tc_project_app/POUs/MAIN.TcPOU index 1545c89..81373c2 100644 --- a/solution/tc_project_app/POUs/MAIN.TcPOU +++ b/solution/tc_project_app/POUs/MAIN.TcPOU @@ -36,7 +36,6 @@ VAR PERSISTENT END_VAR]]> @@ -73,11 +72,6 @@ IF (fbGetDeviceIdentification.stDevIdent.strHardwareSerialNo <> '0') THEN END_IF]]> - - - - - - @@ -220,9 +213,6 @@ END_FOR]]> - - - From 91efd959759c68ff71b71e4971676a452513d01a Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Wed, 9 Dec 2020 15:25:02 +0100 Subject: [PATCH 2/9] Add POU PROG to the solution and call it from MAIN --- solution/tc_project_app/POUs/MAIN.TcPOU | 7 +++--- solution/tc_project_app/POUs/PROG.TcPOU | 16 ++++++++++++ .../tc_project_app/tc_project_app.plcproj | 25 +++++++++++-------- 3 files changed, 34 insertions(+), 14 deletions(-) create mode 100644 solution/tc_project_app/POUs/PROG.TcPOU diff --git a/solution/tc_project_app/POUs/MAIN.TcPOU b/solution/tc_project_app/POUs/MAIN.TcPOU index 81373c2..76816f8 100644 --- a/solution/tc_project_app/POUs/MAIN.TcPOU +++ b/solution/tc_project_app/POUs/MAIN.TcPOU @@ -1,8 +1,7 @@  - +AXES(); +PROG();]]> @@ -199,6 +199,7 @@ END_FOR]]> + diff --git a/solution/tc_project_app/POUs/PROG.TcPOU b/solution/tc_project_app/POUs/PROG.TcPOU new file mode 100644 index 0000000..26bbb8f --- /dev/null +++ b/solution/tc_project_app/POUs/PROG.TcPOU @@ -0,0 +1,16 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index 554b441..0300da7 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -30,6 +30,9 @@ Code + + Code + Code @@ -238,8 +241,8 @@ - - + + "<ProjectRoot>" {192FAD59-8248-4824-A8DE-9177C94C195A} @@ -290,15 +293,15 @@ - - - System.Boolean - System.Collections.Hashtable - System.Int32 - {54dd0eac-a6d8-46f2-8c27-2f43c7e49861} - System.String - - + + + System.Boolean + System.Collections.Hashtable + System.Int32 + {54dd0eac-a6d8-46f2-8c27-2f43c7e49861} + System.String + + \ No newline at end of file From 7a92737f10d22ddca3d6586469c3b7ad35e161bd Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Wed, 9 Dec 2020 15:50:17 +0100 Subject: [PATCH 3/9] create folder for Application Specific programs --- .../Application Specific/EXAMPLE.TcPOU | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 solution/tc_project_app/Application Specific/EXAMPLE.TcPOU diff --git a/solution/tc_project_app/Application Specific/EXAMPLE.TcPOU b/solution/tc_project_app/Application Specific/EXAMPLE.TcPOU new file mode 100644 index 0000000..4ebfd7b --- /dev/null +++ b/solution/tc_project_app/Application Specific/EXAMPLE.TcPOU @@ -0,0 +1,16 @@ + + + + + + + + + + + + \ No newline at end of file From 6cdfc7a0f3dd984c0679fac31e689faf2f0f8dc1 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Wed, 9 Dec 2020 15:50:58 +0100 Subject: [PATCH 4/9] Create EXAMPLE() program and call it to show the intended use --- solution/solution.tsproj | 15 +++++++++-- solution/tc_project_app/POUs/MAIN.TcPOU | 5 ++-- .../tc_project_app/tc_project_app.plcproj | 26 +++++++++++-------- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/solution/solution.tsproj b/solution/solution.tsproj index 66086ff..6c26f56 100644 --- a/solution/solution.tsproj +++ b/solution/solution.tsproj @@ -1,5 +1,5 @@ - + @@ -16,7 +16,7 @@ tc_project_app Instance {08500001-0000-0000-F000-000000000064} - + PlcTask Outputs MAIN.bOutput1 @@ -24,6 +24,17 @@ BOOL + + + 0 + PlcTask + + #x02010040 + + 20 + 10000000 + + diff --git a/solution/tc_project_app/POUs/MAIN.TcPOU b/solution/tc_project_app/POUs/MAIN.TcPOU index 1545c89..e334a27 100644 --- a/solution/tc_project_app/POUs/MAIN.TcPOU +++ b/solution/tc_project_app/POUs/MAIN.TcPOU @@ -75,7 +75,8 @@ END_IF]]> - + @@ -221,7 +222,7 @@ END_FOR]]> - + diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index 554b441..9c68c1c 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -17,6 +17,9 @@ false + + Code + Code @@ -128,6 +131,7 @@ + @@ -238,8 +242,8 @@ - - + + "<ProjectRoot>" {192FAD59-8248-4824-A8DE-9177C94C195A} @@ -290,15 +294,15 @@ - - - System.Boolean - System.Collections.Hashtable - System.Int32 - {54dd0eac-a6d8-46f2-8c27-2f43c7e49861} - System.String - - + + + System.Boolean + System.Collections.Hashtable + System.Int32 + {54dd0eac-a6d8-46f2-8c27-2f43c7e49861} + System.String + + \ No newline at end of file From b7388e21c6817cee3e3489bfbc450ef20c4f6e97 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Wed, 9 Dec 2020 15:59:35 +0100 Subject: [PATCH 5/9] Delete the program prog from the solution and just leave the action from MAIN --- solution/tc_project_app/POUs/PROG.TcPOU | 16 ---------------- solution/tc_project_app/tc_project_app.plcproj | 3 --- 2 files changed, 19 deletions(-) delete mode 100644 solution/tc_project_app/POUs/PROG.TcPOU diff --git a/solution/tc_project_app/POUs/PROG.TcPOU b/solution/tc_project_app/POUs/PROG.TcPOU deleted file mode 100644 index 26bbb8f..0000000 --- a/solution/tc_project_app/POUs/PROG.TcPOU +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index 54f9330..9c68c1c 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -33,9 +33,6 @@ Code - - Code - Code From c4a9e9603768dc0817610f3702aadbf3344262b6 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Wed, 9 Dec 2020 16:17:26 +0100 Subject: [PATCH 6/9] Update version number to 3.1.4024.11 in the pyhton file for the pipeline --- 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 a6372e7..697ca50 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.4023.119"} +CORRECT_VERSIONS = {"**/*.Tc*": "3.1.4024.5", "**/*.tsproj": "3.1.4024.11"} def check_versions(): From 5394cec66bcc8fbb73fe5493a41071086db5c059 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Mon, 25 Jan 2021 13:39:54 +0100 Subject: [PATCH 7/9] Add the folder strucutre, templates and necessary variables for the Application Specific section --- .../Application Specific/EXAMPLE.TcPOU | 16 --------- .../Applications/Application_Template.TcPOU | 18 ++++++++++ .../Axes/Axis_Template.TcPOU | 36 +++++++++++++++++++ solution/tc_project_app/POUs/MAIN.TcPOU | 27 +++++++++++--- .../tc_project_app/tc_project_app.plcproj | 13 ++++--- 5 files changed, 85 insertions(+), 25 deletions(-) delete mode 100644 solution/tc_project_app/Application Specific/EXAMPLE.TcPOU create mode 100644 solution/tc_project_app/POUs/Application Specific/Applications/Application_Template.TcPOU create mode 100644 solution/tc_project_app/POUs/Application Specific/Axes/Axis_Template.TcPOU diff --git a/solution/tc_project_app/Application Specific/EXAMPLE.TcPOU b/solution/tc_project_app/Application Specific/EXAMPLE.TcPOU deleted file mode 100644 index 4ebfd7b..0000000 --- a/solution/tc_project_app/Application Specific/EXAMPLE.TcPOU +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file 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 new file mode 100644 index 0000000..dbf45fb --- /dev/null +++ b/solution/tc_project_app/POUs/Application Specific/Applications/Application_Template.TcPOU @@ -0,0 +1,18 @@ + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..9eead62 --- /dev/null +++ b/solution/tc_project_app/POUs/Application Specific/Axes/Axis_Template.TcPOU @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + \ 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 1ecdd32..3c7ffec 100644 --- a/solution/tc_project_app/POUs/MAIN.TcPOU +++ b/solution/tc_project_app/POUs/MAIN.TcPOU @@ -41,7 +41,11 @@ PROG();]]> - @@ -74,8 +78,14 @@ END_IF]]> - + @@ -208,6 +218,8 @@ END_FOR]]> + + @@ -221,9 +233,14 @@ END_FOR]]> - + + + + + + + - diff --git a/solution/tc_project_app/tc_project_app.plcproj b/solution/tc_project_app/tc_project_app.plcproj index 9c68c1c..6ea8c93 100644 --- a/solution/tc_project_app/tc_project_app.plcproj +++ b/solution/tc_project_app/tc_project_app.plcproj @@ -17,9 +17,6 @@ false - - Code - Code @@ -30,6 +27,12 @@ Code + + Code + + + Code + Code @@ -131,7 +134,9 @@ - + + + From d7060a75e0e42d46056b3ed94e135fb4cad9bf23 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Mon, 25 Jan 2021 13:40:54 +0100 Subject: [PATCH 8/9] Update tc_mca_std_lib's pointer to match MBP-169 --- 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 1223db3..ffd7c25 160000 --- a/solution/tc_project_app/tc_mca_std_lib +++ b/solution/tc_project_app/tc_mca_std_lib @@ -1 +1 @@ -Subproject commit 1223db3af587d1392ecb71a98daef973ffe8603b +Subproject commit ffd7c2575c2ca5bc2b665108eef4310c11ad439b From 4bdb6734240415bdeb604ca71dfa957c740ce600 Mon Sep 17 00:00:00 2001 From: Federico Rojas Date: Mon, 25 Jan 2021 13:45:36 +0100 Subject: [PATCH 9/9] Fix white space damage and update std_lib pointer --- .../Application Specific/Axes/Axis_Template.TcPOU | 14 +++++++------- solution/tc_project_app/POUs/MAIN.TcPOU | 2 +- solution/tc_project_app/tc_mca_std_lib | 2 +- 3 files changed, 9 insertions(+), 9 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 9eead62..d37b2de 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 @@ -3,20 +3,20 @@ diff --git a/solution/tc_project_app/POUs/MAIN.TcPOU b/solution/tc_project_app/POUs/MAIN.TcPOU index 3c7ffec..2f0aeff 100644 --- a/solution/tc_project_app/POUs/MAIN.TcPOU +++ b/solution/tc_project_app/POUs/MAIN.TcPOU @@ -78,7 +78,7 @@ END_IF]]> -