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

clean up of whitespace and test hardware

Browse Source
This commit is contained in:
Cooper
2022-06-01 10:43:51 +01:00
parent 51b3029691
commit 31d836f8d9
5 changed files with 2007 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1977
solution/_Config/NC/NC.xti
View File

File diff suppressed because it is too large Load Diff

104
solution/_Config/PLC/tc_project_app.xti
View File

@@ -1013,85 +1013,15 @@ External Setpoint Generation:
<Name>GVL.astAxes[4].Axis.NcToPlc</Name>
<Type GUID="{72F5AAAA-16DF-4ED3-8367-F6C8C3ADAE99}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
</Var>
<Var>
<Name>GVL.astAxes[5].stStatus.nEncoderRawCounter</Name>
<Comment><![CDATA[Raw encoder counter value]]></Comment>
<Type>UDINT</Type>
</Var>
<Var>
<Name>GVL.astAxes[5].stStatus.nStepperDriveCounter</Name>
<Comment><![CDATA[Raw internal counter from stepper drive]]></Comment>
<Type>UDINT</Type>
</Var>
<Var>
<Name>GVL.astAxes[5].stInputs.bLimitFwd</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL.astAxes[5].stInputs.bLimitBwd</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL.astAxes[5].stInputs.bHomeSensor</Name>
<Comment><![CDATA[Reference siganl for homing]]></Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL.astAxes[5].Axis.NcToPlc</Name>
<Type GUID="{72F5AAAA-16DF-4ED3-8367-F6C8C3ADAE99}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
</Var>
<Var>
<Name>GVL.astAxes[6].stStatus.nEncoderRawCounter</Name>
<Comment><![CDATA[Raw encoder counter value]]></Comment>
<Type>UDINT</Type>
</Var>
<Var>
<Name>GVL.astAxes[6].stStatus.nStepperDriveCounter</Name>
<Comment><![CDATA[Raw internal counter from stepper drive]]></Comment>
<Type>UDINT</Type>
</Var>
<Var>
<Name>GVL.astAxes[6].stInputs.bLimitFwd</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL.astAxes[6].stInputs.bLimitBwd</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL.astAxes[6].stInputs.bHomeSensor</Name>
<Comment><![CDATA[Reference siganl for homing]]></Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL.astAxes[6].Axis.NcToPlc</Name>
<Type GUID="{72F5AAAA-16DF-4ED3-8367-F6C8C3ADAE99}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
</Var>
</Vars>
<Vars VarGrpType="2" AreaNo="1">
<Name>PlcTask Outputs</Name>
<Var>
<Name>limitsPower.bEnableAxis1Limits</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>limitsPower.bEnableAxis2Limits</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>limitsPower.bEnableAxis1Enc</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>limitsPower.bEnableAxis2Enc</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>MAIN.slit1Vertical.GapSizeEncoder</Name>
<Name>Application_Template.mySlits.GapSizeEncoder</Name>
<Type>UDINT</Type>
</Var>
<Var>
<Name>MAIN.slit1Vertical.GapCentreEncoder</Name>
<Name>Application_Template.mySlits.GapCentreEncoder</Name>
<Type>UDINT</Type>
</Var>
<Var>
@@ -1110,14 +1040,6 @@ External Setpoint Generation:
<Name>GVL.astAxes[4].Axis.PlcToNc</Name>
<Type GUID="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" Namespace="MC">PLCTONC_AXIS_REF</Type>
</Var>
<Var>
<Name>GVL.astAxes[5].Axis.PlcToNc</Name>
<Type GUID="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" Namespace="MC">PLCTONC_AXIS_REF</Type>
</Var>
<Var>
<Name>GVL.astAxes[6].Axis.PlcToNc</Name>
<Type GUID="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" Namespace="MC">PLCTONC_AXIS_REF</Type>
</Var>
</Vars>
<Contexts>
<Context>
@@ -1135,4 +1057,26 @@ External Setpoint Generation:
</TaskPouOids>
</Instance>
</Project>
<Mappings>
<OwnerA Name="tc_project_app Instance">
<OwnerB Name="TINC^NC-Task 1 SAF^Axes^N">
<Link VarA="PlcTask Inputs^GVL.astAxes[1].Axis.NcToPlc" VarB="Outputs^ToPlc"/>
<Link VarA="PlcTask Outputs^GVL.astAxes[1].Axis.PlcToNc" VarB="Inputs^FromPlc"/>
</OwnerB>
<OwnerB Name="TINC^NC-Task 1 SAF^Axes^S">
<Link VarA="PlcTask Inputs^GVL.astAxes[2].Axis.NcToPlc" VarB="Outputs^ToPlc"/>
<Link VarA="PlcTask Outputs^GVL.astAxes[2].Axis.PlcToNc" VarB="Inputs^FromPlc"/>
</OwnerB>
<OwnerB Name="TINC^NC-Task 1 SAF^Axes^VC">
<Link VarA="PlcTask Inputs^GVL.astAxes[4].Axis.NcToPlc" VarB="Outputs^ToPlc"/>
<Link VarA="PlcTask Outputs^Application_Template.mySlits.GapCentreEncoder" VarB="Enc^Inputs^In^nDataIn1"/>
<Link VarA="PlcTask Outputs^GVL.astAxes[4].Axis.PlcToNc" VarB="Inputs^FromPlc"/>
</OwnerB>
<OwnerB Name="TINC^NC-Task 1 SAF^Axes^VG">
<Link VarA="PlcTask Inputs^GVL.astAxes[3].Axis.NcToPlc" VarB="Outputs^ToPlc"/>
<Link VarA="PlcTask Outputs^Application_Template.mySlits.GapSizeEncoder" VarB="Enc^Inputs^In^nDataIn1"/>
<Link VarA="PlcTask Outputs^GVL.astAxes[3].Axis.PlcToNc" VarB="Inputs^FromPlc"/>
</OwnerB>
</OwnerA>
</Mappings>
</TcSmItem>

7
solution/tc_project_app/GVLs/GVL_APP.TcGVL
View File

@@ -1,16 +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 := 0; (*~ (OPC: 1 : available for OPC-clients)
nAXIS_NUM: UINT := 4; (*~ (OPC: 1 : available for OPC-clients)
(OPC_PROP[0005]: 1 : OPC_PROP_RIGHTS, here read only) *)
nPNEUMATIC_AXIS_NUM: UINT := 0;
END_VAR]]></Declaration>

9
solution/tc_project_app/POUs/MAIN.TcPOU
View File

@@ -43,8 +43,7 @@ END_FOR
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,8 +74,7 @@ END_IF]]></ST>
</Action>
<Action Name="PROG" Id="{5d03ebbb-2a47-4890-ad6d-e82daf72dc51}">
<Implementation>
<ST><![CDATA[testProg();
limitsPower();]]></ST>
<ST><![CDATA[Application_Template();]]></ST>
</Implementation>
</Action>
<Action Name="RESTORE_POSITIONS" Id="{0c7ee537-7bd9-4833-b428-c17cbb57e893}" FolderPath="POSITION_RECOVERY\">
@@ -214,7 +212,6 @@ END_FOR]]></ST>
<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" />
@@ -225,7 +222,7 @@ END_FOR]]></ST>
<LineId Id="1" Count="0" />
</LineIds>
<LineIds Name="MAIN.PROG">
<LineId Id="13" Count="1" />
<LineId Id="14" Count="0" />
</LineIds>
<LineIds Name="MAIN.RESTORE_POSITIONS">
<LineId Id="567" Count="105" />

2
solution/tc_project_app/tc_mca_std_lib

Submodule solution/tc_project_app/tc_mca_std_lib updated: a542709afd...2794a1567c