Remove ISIS test crate hardware to make branch hardware independent
This commit is contained in:
SCooper
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+2
-1481
File diff suppressed because it is too large
Load Diff
@@ -1,15 +1,13 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.5">
|
||||
<GVL Name="GVL_APP" Id="{8fe9690c-7907-432e-bedb-6fc99b5ce255}">
|
||||
<Declaration><![CDATA[
|
||||
|
||||
{attribute 'qualified_only'}
|
||||
<Declaration><![CDATA[{attribute 'qualified_only'}
|
||||
VAR_GLOBAL
|
||||
|
||||
END_VAR
|
||||
|
||||
VAR_GLOBAL CONSTANT
|
||||
nAXIS_NUM : UINT:=4;
|
||||
nAXIS_NUM : UINT:=0;
|
||||
END_VAR]]></Declaration>
|
||||
</GVL>
|
||||
</TcPlcObject>
|
||||
@@ -1,19 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.5">
|
||||
<POU Name="limitsPower" Id="{7dcb7d67-8fc5-4c4f-a1c9-d3a3a11a9340}" SpecialFunc="None">
|
||||
<Declaration><![CDATA[PROGRAM limitsPower
|
||||
VAR
|
||||
bEnableAxis1Limits AT %Q*: BOOL:=TRUE;
|
||||
bEnableAxis2Limits AT %Q*: BOOL:=TRUE;
|
||||
bEnableAxis1Enc AT %Q*: BOOL:=TRUE;
|
||||
bEnableAxis2Enc AT %Q*: BOOL:=TRUE;
|
||||
END_VAR
|
||||
]]></Declaration>
|
||||
<Implementation>
|
||||
<ST><![CDATA[]]></ST>
|
||||
</Implementation>
|
||||
<LineIds Name="limitsPower">
|
||||
<LineId Id="5" Count="0" />
|
||||
</LineIds>
|
||||
</POU>
|
||||
</TcPlcObject>
|
||||
@@ -1,28 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.5">
|
||||
<POU Name="testProg" Id="{6b742e2c-3720-4a26-aa80-15486c69d838}" SpecialFunc="None">
|
||||
<Declaration><![CDATA[PROGRAM testProg
|
||||
VAR
|
||||
myFirstSlits : FB_SlitPair;
|
||||
|
||||
END_VAR
|
||||
]]></Declaration>
|
||||
<Implementation>
|
||||
<ST><![CDATA[GVL.astAxes[1].stConfig.eHomeSeq:=E_HomingRoutines.eHomeToRef_Bwd;
|
||||
GVL.astAxes[1].stConfig.fHomePosition:=-30;
|
||||
GVL.astAxes[2].stConfig.eHomeSeq:=E_HomingRoutines.eHomeToRef_Fwd;
|
||||
GVL.astAxes[2].stConfig.fHomePosition:=30;
|
||||
|
||||
myFirstSlits(iBladeNegative:=1,iBladePositive:=2, iGapSize:=3, iGapCentre:=4);
|
||||
]]></ST>
|
||||
</Implementation>
|
||||
<LineIds Name="testProg">
|
||||
<LineId Id="10" Count="0" />
|
||||
<LineId Id="12" Count="0" />
|
||||
<LineId Id="11" Count="0" />
|
||||
<LineId Id="13" Count="1" />
|
||||
<LineId Id="5" Count="0" />
|
||||
<LineId Id="20" Count="0" />
|
||||
</LineIds>
|
||||
</POU>
|
||||
</TcPlcObject>
|
||||
@@ -7,15 +7,6 @@ VAR
|
||||
afbAxes: ARRAY [1..GVL_APP.nAXIS_NUM] OF FB_Axis;
|
||||
hmiAxisSelection: INT := 1; //Not possible to use local hmi variables for array indexes
|
||||
|
||||
//Outputs: Power for Limit switches and Home Sensors (every 4th output)
|
||||
bOutput1 AT %Q*: BOOL:= TRUE;
|
||||
//bOutput5 AT %Q*: BOOL:= TRUE;
|
||||
//bOutput13 AT %Q*: BOOL:= TRUE;
|
||||
//bOutput17 AT %Q*: BOOL:= TRUE;
|
||||
//bOutput21 AT %Q*: BOOL:= TRUE;
|
||||
//bOutput24 AT %Q*: BOOL:= TRUE;
|
||||
//bOutput28 AT %Q*: BOOL:= TRUE;
|
||||
|
||||
//Startup, Shutdown and UPS
|
||||
fbUPS: FB_S_UPS_CX51x0;
|
||||
eUpsMode: E_S_UPS_Mode := eSUPS_WrPersistData_Shutdown;
|
||||
@@ -36,9 +27,7 @@ END_VAR]]></Declaration>
|
||||
<Implementation>
|
||||
<ST><![CDATA[POSITION_RECOVERY();
|
||||
AXES();
|
||||
PROG();
|
||||
|
||||
]]></ST>
|
||||
PROG();]]></ST>
|
||||
</Implementation>
|
||||
<Folder Name="POSITION_RECOVERY" Id="{3561f6ef-e145-4ed3-9839-f17334bd2d97}" />
|
||||
<Action Name="AXES" Id="{7eb32732-9b53-4934-8cd9-20ba971dd8ff}">
|
||||
@@ -80,9 +69,14 @@ END_IF]]></ST>
|
||||
</Action>
|
||||
<Action Name="PROG" Id="{5d03ebbb-2a47-4890-ad6d-e82daf72dc51}">
|
||||
<Implementation>
|
||||
<ST><![CDATA[testProg();
|
||||
limitsPower();
|
||||
]]></ST>
|
||||
<ST><![CDATA[//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();
|
||||
|
||||
//Application program calls
|
||||
Application_Template();]]></ST>
|
||||
</Implementation>
|
||||
</Action>
|
||||
<Action Name="RESTORE_POSITIONS" Id="{0c7ee537-7bd9-4833-b428-c17cbb57e893}" FolderPath="POSITION_RECOVERY\">
|
||||
@@ -213,8 +207,6 @@ END_FOR]]></ST>
|
||||
<LineId Id="505" Count="0" />
|
||||
<LineId Id="81" Count="0" />
|
||||
<LineId Id="538" Count="0" />
|
||||
<LineId Id="601" Count="0" />
|
||||
<LineId Id="590" Count="0" />
|
||||
</LineIds>
|
||||
<LineIds Name="MAIN.AXES">
|
||||
<LineId Id="11" Count="1" />
|
||||
@@ -232,7 +224,12 @@ END_FOR]]></ST>
|
||||
<LineId Id="1" Count="0" />
|
||||
</LineIds>
|
||||
<LineIds Name="MAIN.PROG">
|
||||
<LineId Id="11" Count="1" />
|
||||
<LineId Id="4" Count="1" />
|
||||
<LineId Id="7" Count="0" />
|
||||
<LineId Id="6" Count="0" />
|
||||
<LineId Id="8" Count="0" />
|
||||
<LineId Id="10" Count="0" />
|
||||
<LineId Id="9" Count="0" />
|
||||
<LineId Id="3" Count="0" />
|
||||
</LineIds>
|
||||
<LineIds Name="MAIN.RESTORE_POSITIONS">
|
||||
|
||||
Submodule solution/tc_project_app/tc_mca_std_lib updated: 3ccc0a7479...b5612924b3
@@ -27,10 +27,10 @@
|
||||
<Compile Include="PlcTask.TcTTO">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="POUs\Application_Specific\Applications\limitsPower.TcPOU">
|
||||
<Compile Include="POUs\Application_Specific\Applications\Application_Template.TcPOU">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="POUs\Application_Specific\Axes\testProg.TcPOU">
|
||||
<Compile Include="POUs\Application_Specific\Axes\Axis_Template.TcPOU">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="POUs\MAIN.TcPOU">
|
||||
|
||||
Reference in New Issue
Block a user