clean up of whitespace and test hardware

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
File diff suppressed because it is too large Load Diff
+24 -80
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>