Merge branch 'origin/master' into MBP-198_OOP
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
@@ -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">
|
||||
<GlobalTextList Name="GlobalTextList" Id="{c3494959-baa5-4f73-b0cd-9c11912145dd}">
|
||||
<XmlArchive>
|
||||
<Data>
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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">
|
||||
<Task Name="PlcTask" Id="{96ece0eb-a21b-4000-8986-812071c196ce}">
|
||||
<!--CycleTime in micro seconds.-->
|
||||
<CycleTime>10000</CycleTime>
|
||||
|
||||
@@ -466,34 +466,34 @@
|
||||
<d n="FbMethods" t="CaseInsensitiveHashtable" ckt="String" cvt="Guid">
|
||||
<v>ExecuteLooseCapture</v>
|
||||
<v>4e2884cd-dc97-4120-914c-87a83e618f1f</v>
|
||||
<v>ExecuteMouseUp</v>
|
||||
<v>57eea9a5-15d9-4269-bb8d-9fee5420cdb2</v>
|
||||
<v>Init</v>
|
||||
<v>e61a0910-39b6-4bcc-9a64-fcab62230628</v>
|
||||
<v>FB_Exit</v>
|
||||
<v>e6e1ea47-0811-4b03-9888-d0564361e0d6</v>
|
||||
<v>ExecuteMouseDblClick</v>
|
||||
<v>a517a0ac-170b-4df4-b289-55dcb57628ed</v>
|
||||
<v>GetElementInfo</v>
|
||||
<v>f64cb89f-3016-4fba-85f5-02efcd4282c1</v>
|
||||
<v>ExecuteMouseDown</v>
|
||||
<v>94bab392-b395-4c03-9d0e-5738d11bd021</v>
|
||||
<v>ExecuteMouseUp</v>
|
||||
<v>57eea9a5-15d9-4269-bb8d-9fee5420cdb2</v>
|
||||
<v>ExecuteMouseEnter</v>
|
||||
<v>569205fa-533b-4fc2-8d51-21ccab693305</v>
|
||||
<v>FB_Reinit</v>
|
||||
<v>97933c03-0169-4afe-ac83-de892204e120</v>
|
||||
<v>Initialize</v>
|
||||
<v>6946d6e0-129f-4425-b8b0-ef98281a99e9</v>
|
||||
<v>ExecuteMouseMove</v>
|
||||
<v>58fc221c-be14-4e34-871e-a118f8ba9539</v>
|
||||
<v>GetElementInfo</v>
|
||||
<v>f64cb89f-3016-4fba-85f5-02efcd4282c1</v>
|
||||
<v>abstrGetDefaultCursor</v>
|
||||
<v>25718998-50a9-408d-8b3f-20a55e2cc784</v>
|
||||
<v>ExecuteDialogClosed</v>
|
||||
<v>f08d08b6-e70c-4bef-a136-38845bd246d8</v>
|
||||
<v>ExecuteKeyUp</v>
|
||||
<v>7403635b-2725-4f00-93d4-e0dd125959de</v>
|
||||
<v>ExecuteKeyDown</v>
|
||||
<v>9649ecda-3794-4d6b-a8a7-71e528d9d170</v>
|
||||
<v>abstrGetDefaultCursor</v>
|
||||
<v>25718998-50a9-408d-8b3f-20a55e2cc784</v>
|
||||
<v>ExecuteMouseEnter</v>
|
||||
<v>569205fa-533b-4fc2-8d51-21ccab693305</v>
|
||||
<v>ExecuteMouseMove</v>
|
||||
<v>58fc221c-be14-4e34-871e-a118f8ba9539</v>
|
||||
<v>Initialize</v>
|
||||
<v>6946d6e0-129f-4425-b8b0-ef98281a99e9</v>
|
||||
<v>ExecuteMouseLeave</v>
|
||||
<v>3bacea68-55b4-4764-928e-e69910299932</v>
|
||||
<v>FB_Init</v>
|
||||
|
||||
Submodule solution/tc_project_app/tc_mca_std_lib updated: 3a2e248736...c17684688b
@@ -16,6 +16,7 @@
|
||||
<Released>false</Released>
|
||||
<CompilerVersion>
|
||||
</CompilerVersion>
|
||||
<WriteProductVersion>true</WriteProductVersion>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="GlobalTextList.TcGTLO">
|
||||
@@ -76,6 +77,9 @@
|
||||
<Compile Include="tc_mca_std_lib\DUTs\E_AxisParameters.TcTLEO">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\E_MonitoringLedFunction.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\E_MotorTypeClass.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
@@ -89,6 +93,9 @@
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\I_Axis.TcIO">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\E_SlitPairStatesV2.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\Pneumatics\E_PneumaticAxisErrors.TcDUT">
|
||||
@@ -118,6 +125,9 @@
|
||||
<Compile Include="tc_mca_std_lib\DUTs\E_SlitPairStates.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\ST_MonitoringAlarm.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\E_MotionFunctions.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
@@ -127,12 +137,18 @@
|
||||
<Compile Include="tc_mca_std_lib\GVLs\GVL.TcGVL">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\POUs\FB_ESSMonitoring.TcPOU">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\POUs\Motion\FB_Axis.TcPOU">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\POUs\Motion\FB_SlitPair.TcPOU">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\POUs\Motion\FB_SlitPairV2.TcPOU">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\POUs\Motion\Homing\FB_Homing.TcPOU">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
@@ -397,7 +413,7 @@
|
||||
<Resolution>Tc2_Math, * (Beckhoff Automation GmbH)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="Tc2_MC2">
|
||||
<Resolution>Tc2_MC2, * (Beckhoff Automation GmbH)</Resolution>
|
||||
<Resolution>Tc2_MC2, 3.3.48.0 (Beckhoff Automation GmbH)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="Tc2_MC2_Drive">
|
||||
<Resolution>Tc2_MC2_Drive, * (Beckhoff Automation GmbH)</Resolution>
|
||||
|
||||
Reference in New Issue
Block a user