berti_r/Motion_test
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'origin/master' into MBP-198_OOP

Browse Source 
Conflicts:
solution/_Config/PLC/tc_project_app.xti
solution/solution.tsproj
solution/tc_project_app/POUs/MAIN.TcPOU
solution/tc_project_app/tc_mca_std_lib
solution/tc_project_app/tc_project_app.plcproj
This commit is contained in:
Federico Rojas
2022-08-25 13:11:11 +02:00
parent c4bdac87e8 9b4fc9f313
commit c852cd9e57
11 changed files with 37 additions and 989 deletions
Download Patch File Download Diff File Expand all files Collapse all files
solution/tc_project_app/POUs/Application_Specific/Applications/Application_Template.TcPOU
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.5">
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.11">
<POU Name="Application_Template" Id="{4bdeebc0-15d8-4790-97d0-e9c4239d121c}" SpecialFunc="None">
<Declaration><![CDATA[PROGRAM Application_Template
VAR
solution/tc_project_app/POUs/Application_Specific/Axes/Pneumatics_Template.TcPOU
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.5">
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.11">
<POU Name="Pneumatics_Template" Id="{7bf401fb-a600-4741-a67b-36f20e194cfc}" SpecialFunc="None">
<Declaration><![CDATA[PROGRAM Pneumatics_Template
VAR