Merge branch 'master' of https://bitbucket.org/europeanspallationsource/tc_generic_structure
This commit is contained in:
Federico Rojas
@@ -13,6 +13,8 @@ UpgradeLog.htm
|
||||
_Boot/
|
||||
_CompileInfo/
|
||||
_Libraries/
|
||||
solution/tc_project_app/LineIDs.dbg
|
||||
LineIDs.dbg
|
||||
logs.0*
|
||||
solution/TrialLicense.tclrs
|
||||
tools/linux/ADS/
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 2013
|
||||
VisualStudioVersion = 12.0.21005.1
|
||||
# TcXaeShell Solution File, Format Version 11.00
|
||||
VisualStudioVersion = 15.0.28307.1300
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{B1E792BE-AA5F-4E3C-8C82-674BF9C0715B}") = "solution", "solution\solution.tsproj", "{9CF97348-B9D3-4938-B1F2-5F0B0B6AA66A}"
|
||||
EndProject
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
Copy and paste in this folder the licenses contained inside the Beckhoff CPU in the path:
|
||||
|
||||
C:\TwinCAT\3.1\Target\License
|
||||
|
||||
Thank you
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0"?>
|
||||
<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.11" ClassName="CNcSafTaskDef" SubType="0">
|
||||
<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.32" ClassName="CNcSafTaskDef" SubType="0">
|
||||
<NC>
|
||||
<SafTask Priority="4" CycleTime="20000" AmsPort="501" IoAtBegin="true">
|
||||
<Name>NC-Task 1 SAF</Name>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0"?>
|
||||
<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.11" ClassName="CNestedPlcProjDef">
|
||||
<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.32" ClassName="CNestedPlcProjDef">
|
||||
<Project GUID="{FB261665-FD20-4BF2-97F8-2854C82B752D}" Name="tc_project_app" PrjFilePath="..\..\tc_project_app\tc_project_app.plcproj" TmcFilePath="..\..\tc_project_app\tc_project_app.tmc" ReloadTmc="true" AmsPort="852" FileArchiveSettings="#x000e" SymbolicMapping="true">
|
||||
<Instance Id="#x08502040" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tc_project_app\tc_project_app.tmc">
|
||||
<Instance Id="#x08502040" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tc_project_app\tc_project_app.tmc" TmcHash="{ADC2B2A9-6B59-ADAD-13BB-395B58F0375E}">
|
||||
<Name>tc_project_app Instance</Name>
|
||||
<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
|
||||
<Contexts>
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
<?xml version="1.0"?>
|
||||
<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.11">
|
||||
<TcSmProject xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.32">
|
||||
<Project ProjectGUID="{9CF97348-B9D3-4938-B1F2-5F0B0B6AA66A}" Target64Bit="true" ShowHideConfigurations="#x106">
|
||||
<System>
|
||||
<Settings MaxCpus="2" NonWinCpus="1" DontCheckTarget="10.0.5.148.1.1">
|
||||
<Settings MaxCpus="2" DontCheckTarget="10.0.5.148.1.1">
|
||||
<Cpu CpuId="1"/>
|
||||
<IoIdleTask Priority="6"/>
|
||||
</Settings>
|
||||
|
||||
@@ -1,16 +1,13 @@
|
||||
<?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">
|
||||
<GVL Name="GVL_APP" Id="{8fe9690c-7907-432e-bedb-6fc99b5ce255}">
|
||||
<Declaration><![CDATA[{attribute 'qualified_only'}
|
||||
VAR_GLOBAL
|
||||
|
||||
END_VAR
|
||||
|
||||
VAR_GLOBAL CONSTANT
|
||||
nAXIS_NUM: UINT := 0; (*~ (OPC: 1 : available for OPC-clients)
|
||||
(OPC_PROP[0005]: 1 : OPC_PROP_RIGHTS, here read only) *)
|
||||
nAXIS_NUM: UINT := 0; (*~ (OPC: 1 : available for OPC-clients)(OPC_PROP[0005]: 1 : OPC_PROP_RIGHTS, here read only)*)
|
||||
nPNEUMATIC_AXIS_NUM: UINT := 0;
|
||||
END_VAR
|
||||
]]></Declaration>
|
||||
END_VAR]]></Declaration>
|
||||
</GVL>
|
||||
</TcPlcObject>
|
||||
@@ -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
-5
@@ -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
|
||||
@@ -10,9 +10,5 @@ END_VAR
|
||||
<ST><![CDATA[//Program any specific code or safety code for an specific application when it involves multiple axes
|
||||
//Eg. Collision avoidance, interlocks, sequencing, etc.]]></ST>
|
||||
</Implementation>
|
||||
<LineIds Name="Application_Template">
|
||||
<LineId Id="5" Count="0" />
|
||||
<LineId Id="10" Count="0" />
|
||||
</LineIds>
|
||||
</POU>
|
||||
</TcPlcObject>
|
||||
@@ -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="Axis_Template" Id="{1a43acb4-bd2e-4637-97fb-9976d47292b6}" SpecialFunc="None">
|
||||
<Declaration><![CDATA[PROGRAM Axis_Template
|
||||
VAR
|
||||
@@ -8,8 +8,7 @@ VAR
|
||||
|
||||
//Hardware interlocks
|
||||
//bInterlockFwdOK AT %I*: BOOL;
|
||||
END_VAR
|
||||
]]></Declaration>
|
||||
END_VAR]]></Declaration>
|
||||
<Implementation>
|
||||
<ST><![CDATA[//Initial parameters of an Axis
|
||||
(*IF _TaskInfo[fbGetCurTaskIndex.index].FirstCycle THEN
|
||||
@@ -21,20 +20,7 @@ END_IF*)
|
||||
|
||||
//Define ACTIONS() or write exclusive code for an specific axis.
|
||||
(*Eg. Stop when temperature reaches certain values, reduce speed if a signal is activated, etc.
|
||||
Eg. GVL.astAxes[x].stControl.bInterlockFwd := NOT bInterlockFwdOK;*)
|
||||
]]></ST>
|
||||
Eg. GVL.astAxes[x].stControl.bInterlockFwd := NOT bInterlockFwdOK;*)]]></ST>
|
||||
</Implementation>
|
||||
<LineIds Name="Axis_Template">
|
||||
<LineId Id="20" Count="0" />
|
||||
<LineId Id="5" Count="0" />
|
||||
<LineId Id="13" Count="0" />
|
||||
<LineId Id="17" Count="2" />
|
||||
<LineId Id="14" Count="0" />
|
||||
<LineId Id="22" Count="0" />
|
||||
<LineId Id="21" Count="0" />
|
||||
<LineId Id="24" Count="0" />
|
||||
<LineId Id="33" Count="0" />
|
||||
<LineId Id="23" Count="0" />
|
||||
</LineIds>
|
||||
</POU>
|
||||
</TcPlcObject>
|
||||
@@ -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
|
||||
@@ -17,17 +17,5 @@ END_VAR
|
||||
|
||||
]]></ST>
|
||||
</Implementation>
|
||||
<LineIds Name="Pneumatics_Template">
|
||||
<LineId Id="8" Count="0" />
|
||||
<LineId Id="89" Count="0" />
|
||||
<LineId Id="33" Count="0" />
|
||||
<LineId Id="32" Count="0" />
|
||||
<LineId Id="9" Count="0" />
|
||||
<LineId Id="31" Count="0" />
|
||||
<LineId Id="13" Count="0" />
|
||||
<LineId Id="27" Count="0" />
|
||||
<LineId Id="17" Count="0" />
|
||||
<LineId Id="30" Count="0" />
|
||||
</LineIds>
|
||||
</POU>
|
||||
</TcPlcObject>
|
||||
@@ -1,9 +1,10 @@
|
||||
<?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="MAIN" Id="{33eb6f49-7781-4211-a70b-87ada6d80cb7}" SpecialFunc="None">
|
||||
<Declaration><![CDATA[PROGRAM MAIN
|
||||
VAR
|
||||
sVersion: STRING := '1.0.0';
|
||||
aIAxes: ARRAY [1..GVL_APP.nAXIS_NUM] OF I_Axis;
|
||||
afbAxes: ARRAY [1..GVL_APP.nAXIS_NUM] OF FB_Axis;
|
||||
afbPneumaticAxes: ARRAY [1..GVL_APP.nPNEUMATIC_AXIS_NUM] OF FB_PneumaticAxis;
|
||||
hmiAxisSelection: INT := 1; //Not possible to use local hmi variables for array indexes
|
||||
@@ -16,10 +17,10 @@ VAR
|
||||
bRestoreExecute: BOOL := FALSE;
|
||||
bExecuteReadEncRefSys: BOOL := FALSE;
|
||||
nRetry: INT;
|
||||
iAxes : UINT; //index for for loops in Position recovery actions
|
||||
iAxes: UINT; //index for for loops in Position recovery actions
|
||||
afbReadEncRefSys: ARRAY [1..GVL_APP.nAXIS_NUM] OF MC_ReadParameter;
|
||||
afbRestorePosition: ARRAY [1..GVL_APP.nAXIS_NUM] OF MC_SetPosition;
|
||||
fbGetDeviceIdentification: FB_GetDeviceIdentification;
|
||||
fbGetDeviceIdentification: FB_GetDeviceIdentificationEx;
|
||||
END_VAR
|
||||
|
||||
VAR PERSISTENT
|
||||
@@ -27,24 +28,33 @@ VAR PERSISTENT
|
||||
END_VAR]]></Declaration>
|
||||
<Implementation>
|
||||
<ST><![CDATA[POSITION_RECOVERY();
|
||||
AXES();
|
||||
PROG();]]></ST>
|
||||
PROG();
|
||||
AXES();]]></ST>
|
||||
</Implementation>
|
||||
<Folder Name="POSITION_RECOVERY" Id="{3561f6ef-e145-4ed3-9839-f17334bd2d97}" />
|
||||
<Action Name="AXES" Id="{7eb32732-9b53-4934-8cd9-20ba971dd8ff}">
|
||||
<Implementation>
|
||||
<ST><![CDATA[//Get task index for Axes parameters initialization.
|
||||
GVL.fbGetCurTaskIndex();
|
||||
<ST><![CDATA[//First cycle, assign FB_axis to interface array
|
||||
IF _TaskInfo[fbGetCurTaskIndex.index].FirstCycle THEN
|
||||
FOR GVL.iAxis := 1 TO GVL_APP.nAXIS_NUM DO
|
||||
afbAxes[GVL.iAxis].stAxis REF= astAxes[GVL.iAxis];
|
||||
aIAxes[GVL.iAxis] := afbAxes[GVL.iAxis];
|
||||
END_FOR
|
||||
//Custom axis types defined and linked to aiAxes here
|
||||
//FB_CustomAxis extends FB_axis
|
||||
//fbCustomAxis.stAxis REF= astAxes[x];
|
||||
//aIAxes[x] := fbCustomAxis;
|
||||
END_IF
|
||||
|
||||
//Create an stAxisStruct for every axis in the project.
|
||||
//Execute FB_Axis logic
|
||||
FOR GVL.iAxis := 1 TO GVL_APP.nAXIS_NUM DO
|
||||
afbAxes[GVL.iAxis](stAxisStruct := GVL.astAxes[GVL.iAxis]);
|
||||
aIAxes[GVL.iAxis].Run();
|
||||
END_FOR
|
||||
|
||||
//Execute Pneumatic Axis logic
|
||||
FOR GVL.iPneumaticAxis := 1 TO GVL_APP.nPNEUMATIC_AXIS_NUM DO
|
||||
afbPneumaticAxes[GVL.iPneumaticAxis](stPneumaticAxisStruct := GVL.astPneumaticAxes[GVL.iPneumaticAxis]);
|
||||
END_FOR
|
||||
]]></ST>
|
||||
END_FOR]]></ST>
|
||||
</Implementation>
|
||||
</Action>
|
||||
<Action Name="CHECK_UPS" Id="{f0f28f50-53b8-4f73-b0f5-6d7ce4c1636f}" FolderPath="POSITION_RECOVERY\">
|
||||
@@ -75,16 +85,18 @@ END_IF]]></ST>
|
||||
</Action>
|
||||
<Action Name="PROG" Id="{5d03ebbb-2a47-4890-ad6d-e82daf72dc51}">
|
||||
<Implementation>
|
||||
<ST><![CDATA[//Call the programs that are defined in the "Application Specific" folder.
|
||||
<ST><![CDATA[//Get task index for Axes parameters initialization.
|
||||
GVL.fbGetCurTaskIndex();
|
||||
|
||||
//Call the programs that are defined in the "Application Specific" folder.
|
||||
//Create as many programs in that folder as axes and applications you have or need
|
||||
|
||||
//Axes initial parameters and program
|
||||
Axis_Template();
|
||||
//Axis_Template();
|
||||
//Pneumatics_Template();
|
||||
|
||||
//Application program calls
|
||||
//Application_Template();
|
||||
]]></ST>
|
||||
//Application_Template();]]></ST>
|
||||
</Implementation>
|
||||
</Action>
|
||||
<Action Name="RESTORE_POSITIONS" Id="{0c7ee537-7bd9-4833-b428-c17cbb57e893}" FolderPath="POSITION_RECOVERY\">
|
||||
@@ -211,51 +223,5 @@ END_IF]]></ST>
|
||||
END_FOR]]></ST>
|
||||
</Implementation>
|
||||
</Action>
|
||||
<LineIds Name="MAIN">
|
||||
<LineId Id="505" Count="0" />
|
||||
<LineId Id="81" Count="0" />
|
||||
<LineId Id="538" Count="0" />
|
||||
</LineIds>
|
||||
<LineIds Name="MAIN.AXES">
|
||||
<LineId Id="11" Count="1" />
|
||||
<LineId Id="14" Count="1" />
|
||||
<LineId Id="1" Count="0" />
|
||||
<LineId Id="4" Count="0" />
|
||||
<LineId Id="10" Count="0" />
|
||||
<LineId Id="18" Count="3" />
|
||||
<LineId Id="17" Count="0" />
|
||||
</LineIds>
|
||||
<LineIds Name="MAIN.CHECK_UPS">
|
||||
<LineId Id="2" Count="11" />
|
||||
<LineId Id="1" Count="0" />
|
||||
</LineIds>
|
||||
<LineIds Name="MAIN.POSITION_RECOVERY">
|
||||
<LineId Id="2" Count="3" />
|
||||
<LineId Id="1" Count="0" />
|
||||
</LineIds>
|
||||
<LineIds Name="MAIN.PROG">
|
||||
<LineId Id="4" Count="1" />
|
||||
<LineId Id="7" Count="0" />
|
||||
<LineId Id="6" Count="0" />
|
||||
<LineId Id="8" Count="0" />
|
||||
<LineId Id="12" Count="0" />
|
||||
<LineId Id="10" Count="0" />
|
||||
<LineId Id="9" Count="0" />
|
||||
<LineId Id="3" Count="0" />
|
||||
<LineId Id="11" Count="0" />
|
||||
</LineIds>
|
||||
<LineIds Name="MAIN.RESTORE_POSITIONS">
|
||||
<LineId Id="567" Count="105" />
|
||||
<LineId Id="1" Count="0" />
|
||||
</LineIds>
|
||||
<LineIds Name="MAIN.STORE_PERSISTENT">
|
||||
<LineId Id="10" Count="0" />
|
||||
<LineId Id="3" Count="0" />
|
||||
<LineId Id="5" Count="1" />
|
||||
<LineId Id="8" Count="1" />
|
||||
<LineId Id="7" Count="0" />
|
||||
<LineId Id="4" Count="0" />
|
||||
<LineId Id="1" Count="0" />
|
||||
</LineIds>
|
||||
</POU>
|
||||
</TcPlcObject>
|
||||
@@ -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>
|
||||
|
||||
@@ -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">
|
||||
<VisuManager Name="Visualization Manager" Id="{9ab27b0a-e061-4269-b032-b221661a7379}">
|
||||
<XmlArchive>
|
||||
<Data>
|
||||
@@ -45,10 +45,10 @@
|
||||
<d n="FbMethods" t="CaseInsensitiveHashtable" ckt="String" cvt="Guid">
|
||||
<v>FB_Init</v>
|
||||
<v>c98701bd-1e9f-450a-a2a8-a2474d536f2e</v>
|
||||
<v>FB_Reinit</v>
|
||||
<v>5b6e372a-a69d-40e8-aef7-f470b7c53d95</v>
|
||||
<v>FB_Exit</v>
|
||||
<v>0be1b9ab-e8eb-4b33-b803-109abb46bde4</v>
|
||||
<v>FB_Reinit</v>
|
||||
<v>5b6e372a-a69d-40e8-aef7-f470b7c53d95</v>
|
||||
</d>
|
||||
<v n="FbName">"NotImportant"</v>
|
||||
<v n="FbGuid">{aa8b7e42-e967-427f-8f2e-f00f9d706470}</v>
|
||||
@@ -58,7 +58,7 @@
|
||||
<v n="Modifiers">7</v>
|
||||
<v n="DevType">4096</v>
|
||||
<v n="DevId">"1002 0004"</v>
|
||||
<v n="DevVersion">"1.0.0.4"</v>
|
||||
<v n="DevVersion">"1.0.0.6"</v>
|
||||
<v n="BaseProvider">{cb73a13e-6ccc-4bc6-8859-f5aa98bb116b}</v>
|
||||
<l n="Keys" t="ArrayList" cet="DeviceBasedHotkeyItem">
|
||||
<o>
|
||||
@@ -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: ef11a1b4c0...1f21feeafd
@@ -16,6 +16,7 @@
|
||||
<Released>false</Released>
|
||||
<CompilerVersion>
|
||||
</CompilerVersion>
|
||||
<WriteProductVersion>true</WriteProductVersion>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="GlobalTextList.TcGTLO">
|
||||
@@ -40,6 +41,33 @@
|
||||
<Compile Include="POUs\MAIN.TcPOU">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\Axis_Structures\ST_AxisConfig.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\Axis_Structures\ST_AxisControl.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\Axis_Structures\ST_AxisDescription.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\Axis_Structures\ST_AxisError.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\Axis_Structures\ST_AxisInputs.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\Axis_Structures\ST_AxisPersistent.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\Axis_Structures\ST_AxisStatus.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\Axis_Structures\ST_AxisStruct.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\Axis_Structures\ST_GearAxis.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\E_AxisParameters.TcTLEO">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
@@ -49,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>
|
||||
@@ -61,6 +92,12 @@
|
||||
<Compile Include="tc_mca_std_lib\DUTs\E_RestorePosition.TcDUT">
|
||||
<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">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
@@ -88,45 +125,30 @@
|
||||
<Compile Include="tc_mca_std_lib\DUTs\E_SlitPairStates.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\ST_AxisConfig.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\ST_AxisControl.TcDUT">
|
||||
<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>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\ST_AxisDescription.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\ST_AxisError.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\ST_AxisInputs.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\ST_AxisPersistent.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\ST_GearAxis.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\ST_AxisStatus.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\DUTs\ST_AxisStruct.TcDUT">
|
||||
<Compile Include="tc_mca_std_lib\DUTs\ST_McStatus.TcDUT">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<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>
|
||||
@@ -140,6 +162,9 @@
|
||||
<SubType>Code</SubType>
|
||||
<DependentUpon>Visualization Manager.TcVMO</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\VISUs\ParameterTextList.TcTLO">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="tc_mca_std_lib\VISUs\PneumaticsVisu.TcVIS">
|
||||
<SubType>Code</SubType>
|
||||
<DependentUpon>Visualization Manager.TcVMO</DependentUpon>
|
||||
@@ -154,6 +179,7 @@
|
||||
<Folder Include="POUs\Application_Specific" />
|
||||
<Folder Include="POUs\Application_Specific\Applications" />
|
||||
<Folder Include="POUs\Application_Specific\Axes" />
|
||||
<Folder Include="tc_mca_std_lib\DUTs\Axis_Structures" />
|
||||
<Folder Include="tc_mca_std_lib\DUTs\Pneumatics" />
|
||||
<Folder Include="POUs\Application_Specific\Applications" />
|
||||
<Folder Include="POUs\Application_Specific\Axes" />
|
||||
@@ -260,8 +286,161 @@
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PlaceholderResolution Include="CAA Callback">
|
||||
<Resolution>CAA Callback Extern, * (CAA Technical Workgroup)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="CAA MemBlockMan">
|
||||
<Resolution>CAA Memory Block Manager Extern, * (CAA Technical Workgroup)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="CAA ResMan">
|
||||
<Resolution>CAA Ressource Manager Extern, * (CAA Technical Workgroup)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="CAA Types">
|
||||
<Resolution>CAA Types Extern, * (CAA Technical Workgroup)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="CmpApp">
|
||||
<Resolution>CmpApp, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="CmpBitmapPool">
|
||||
<Resolution>CmpBitmapPool, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="CmpDynamicText">
|
||||
<Resolution>CmpDynamicText, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="CmpEventMgr">
|
||||
<Resolution>CmpEventMgr, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="CmpLog">
|
||||
<Resolution>CmpLog, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="CmpSchedule">
|
||||
<Resolution>CmpSchedule, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="CmpTargetVisu">
|
||||
<Resolution>CmpTargetVisu, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="CmpVisuHandler">
|
||||
<Resolution>CmpVisuHandler, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="Collections">
|
||||
<Resolution>Collections, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="Component Manager">
|
||||
<Resolution>Component Manager, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="FloatingPointUtils">
|
||||
<Resolution>FloatingPointUtils, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="Standard">
|
||||
<Resolution>Tc2_Standard, * (Beckhoff Automation GmbH)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="Standard64">
|
||||
<Resolution>Tc2_Standard, * (Beckhoff Automation GmbH)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="StringUtils">
|
||||
<Resolution>StringUtils, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="SysCpuHandling">
|
||||
<Resolution>SysCpuHandling, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="SysDir">
|
||||
<Resolution>SysDir, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="SysFile">
|
||||
<Resolution>SysFile, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="SysMem">
|
||||
<Resolution>SysMem, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="SysProcess">
|
||||
<Resolution>SysProcess, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="SysShm">
|
||||
<Resolution>SysShm, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="SysTarget">
|
||||
<Resolution>SysTarget, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="System_VisuElemBase">
|
||||
<Resolution>VisuElemBase, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="System_VisuElemEventTable">
|
||||
<Resolution>VisuElemEventTable, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="System_VisuElemMeter">
|
||||
<Resolution>VisuElemMeter, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="System_VisuElems">
|
||||
<Resolution>VisuElems, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="System_VisuElemsSpecialControls">
|
||||
<Resolution>VisuElemsSpecialControls, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="System_VisuElemsWinControls">
|
||||
<Resolution>VisuElemsWinControls, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="System_VisuElemTextEditor">
|
||||
<Resolution>VisuElemTextEditor, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="system_visuinputs">
|
||||
<Resolution>VisuInputs, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="System_VisuInputs">
|
||||
<Resolution>VisuInputs, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="System_VisuNativeControl">
|
||||
<Resolution>VisuNativeControl, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="SysTime">
|
||||
<Resolution>SysTime, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="SysTimeCore">
|
||||
<Resolution>SysTimeCore, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="SysTimeRtc">
|
||||
<Resolution>SysTimeRtc, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="Tc2_Drive">
|
||||
<Resolution>Tc2_Drive, * (Beckhoff Automation GmbH)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="Tc2_EtherCAT">
|
||||
<Resolution>Tc2_EtherCAT, * (Beckhoff Automation GmbH)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="Tc2_IoFunctions">
|
||||
<Resolution>Tc2_IoFunctions, * (Beckhoff Automation GmbH)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="Tc2_Math">
|
||||
<Resolution>Tc2_Math, * (Beckhoff Automation GmbH)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="Tc2_MC2">
|
||||
<Resolution>Tc2_MC2, 3.3.41.0 (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>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="Tc2_Standard">
|
||||
<Resolution>Tc2_Standard, * (Beckhoff Automation GmbH)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="Tc2_SUPS">
|
||||
<Resolution>Tc2_SUPS, * (Beckhoff Automation GmbH)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="Tc2_System">
|
||||
<Resolution>Tc2_System, * (Beckhoff Automation GmbH)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="Tc2_Utilities">
|
||||
<Resolution>Tc2_Utilities, * (Beckhoff Automation GmbH)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="Tc3_MC2_AdvancedHoming">
|
||||
<Resolution>Tc3_MC2_AdvancedHoming, * (Beckhoff Automation GmbH)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="Tc3_Module">
|
||||
<Resolution>Tc3_Module, * (Beckhoff Automation GmbH)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="Util">
|
||||
<Resolution>Util, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
<PlaceholderResolution Include="VisuDialogs">
|
||||
<Resolution>VisuDialogs, * (System)</Resolution>
|
||||
</PlaceholderResolution>
|
||||
</ItemGroup>
|
||||
<ProjectExtensions>
|
||||
|
||||
@@ -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.4024.11"}
|
||||
CORRECT_VERSIONS = {"**/*.Tc*": "3.1.4024.11", "**/*.tsproj": "3.1.4024.32", "**/*.xti": "3.1.4024.32"}
|
||||
|
||||
|
||||
def check_versions():
|
||||
|
||||
Reference in New Issue
Block a user