Merge remote-tracking branch 'origin/master' into MBP-105-control-of-pneumatic-actuators

This commit is contained in:
Kristina Jurisic
2021-11-01 10:36:56 +01:00
7 changed files with 21 additions and 20 deletions

View File

@@ -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.4023.119" 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.11" ClassName="CNcSafTaskDef" SubType="0">
<NC>
<SafTask Priority="4" CycleTime="20000" AmsPort="501" IoAtBegin="true">
<Name>NC-Task 1 SAF</Name>

View File

@@ -4,14 +4,6 @@
<Instance Id="#x08502040" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="tc_project_app\tc_project_app.tmc">
<Name>tc_project_app Instance</Name>
<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
<Vars VarGrpType="2" AreaNo="1">
<Name>PlcTask Outputs</Name>
<Var>
<Name>MAIN.bOutput1</Name>
<Comment><![CDATA[Outputs: Power for Limit switches and Home Sensors (every 4th output)]]></Comment>
<Type>BOOL</Type>
</Var>
</Vars>
<Contexts>
<Context>
<Id NeedCalleeCall="true">0</Id>

View File

@@ -7,7 +7,8 @@ VAR_GLOBAL
END_VAR
VAR_GLOBAL CONSTANT
nAXIS_NUM: UINT := 0;
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>

View File

@@ -360,6 +360,11 @@
<v n="TextDefault">"halt"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"123"</v>
<v n="TextDefault">"HOME"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"169"</v>
<v n="TextDefault">"homeDirect"</v>

View File

@@ -3,7 +3,11 @@
<POU Name="Axis_Template" Id="{1a43acb4-bd2e-4637-97fb-9976d47292b6}" SpecialFunc="None">
<Declaration><![CDATA[PROGRAM Axis_Template
VAR
//Outputs: Power for Limit switches, Home Sensors, etc.
//bPowerSwitchesAxis1 AT %Q*: BOOL:= TRUE;
//Hardware interlocks
//bInterlockFwdOK AT %I*: BOOL;
END_VAR
]]></Declaration>
<Implementation>
@@ -16,7 +20,8 @@ END_VAR
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. Stop when temperature reaches certain values, reduce speed if a signal is activated, etc.
Eg. GVL.astAxes[x].stControl.bInterlockFwd := NOT bInterlockFwdOK;*)
]]></ST>
</Implementation>
<LineIds Name="Axis_Template">
@@ -28,6 +33,7 @@ END_IF*)
<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>

View File

@@ -7,15 +7,6 @@ VAR
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
hmiPneumaticAxisSelection: INT := 1; //Variable for hmi pneumatic axis selection
//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;

View File

@@ -83,6 +83,9 @@
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\DUTs\Pneumatics\ST_PneumaticAxisStruct.TcDUT">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\DUTs\E_SlitPairStates.TcDUT">
<SubType>Code</SubType>
</Compile>
<Compile Include="tc_mca_std_lib\DUTs\ST_AxisConfig.TcDUT">
@@ -121,6 +124,9 @@
<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\Homing\FB_Homing.TcPOU">
<SubType>Code</SubType>
</Compile>