Skip to content

Commit

Permalink
Merge pull request pcdshub#90 from tongju12/SP1K4-ATT-PMPS
Browse files Browse the repository at this point in the history 
adding sp1k4-att states and PMPS
  • Loading branch information
@tongju12
tongju12 authored Aug 14, 2023
2 parents 0955b49 + 7f6aeea commit 7abc07c
Show file tree
Hide file tree
Showing 6 changed files with 2,245 additions and 980 deletions.
331 changes: 329 additions & 2 deletions plc-tmo-motion/_Config/PLC/tmo_motion.xti
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3696,6 +3696,300 @@ External Setpoint Generation:
</Comment>
<Type>INT</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[1].Axis.NcToPlc</Name>
<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
<SubVar>
<Name>AxisState</Name>
<Comment>
<![CDATA[Present State Of The Axis Movement (continuous axis):
0 = INACTIVE: axis has no job
1 = RUNNING: axis is executing a motion job
2 = OVERRIDE_ZERO: axis is executing a job but override is zero
3 = PHASE_VELOCONST: axis is moving at constant velocity
4 = PHASE_ACCPOS: axis is accelerating
5 = PHASE_ACCNEG: axis is decelerating
Slaves only:
11 = PREPHASE: slave axis is in a motion pre-phase
12 = SYNCHRONIZING: slave axis is synchronizing
13 = SYNCHRONOUS: slave axis is moving synchronously
External Setpoint Generation:
41 = EXTSETGEN_MODE1: external setpoint generation active
42 = EXTSETGEN_MODE2: internal and external setpoint gen. active
]]>
</Comment>
</SubVar>
<SubVar>
<Name>HomingState</Name>
<Comment>
<![CDATA[Axis Homing Status:
0: idle
1: start homing
2: searching home switch
3: stopping on home switch
4: moving off home switch
5: searching sync pulse
6: stopping after homing
]]>
</Comment>
</SubVar>
<SubVar>
<Name>CoupleState</Name>
<Comment>
<![CDATA[Axis Coupling Status:
0: axis is a single axis (not coupled)
1: axis is a master axis
2: axis is master and slave
3: axis is a slave axis
]]>
</Comment>
</SubVar>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[1].bLimitForwardEnable</Name>
<Comment>
<![CDATA[ NC Forward Limit Switch: TRUE if ok to move]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[1].bLimitBackwardEnable</Name>
<Comment>
<![CDATA[ NC Backward Limit Switch: TRUE if ok to move]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[1].bHome</Name>
<Comment>
<![CDATA[ NO Home Switch: TRUE if at home]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[1].bHardwareEnable</Name>
<Comment>
<![CDATA[ NC STO Input: TRUE if ok to move]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[1].nRawEncoderULINT</Name>
<Comment>
<![CDATA[ Raw encoder IO for ULINT (Biss-C)]]>
</Comment>
<Type>ULINT</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[1].nRawEncoderUINT</Name>
<Comment>
<![CDATA[ Raw encoder IO for UINT (Relative Encoders)]]>
</Comment>
<Type>UINT</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[1].nRawEncoderINT</Name>
<Comment>
<![CDATA[ Raw encoder IO for INT (LVDT)]]>
</Comment>
<Type>INT</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[2].Axis.NcToPlc</Name>
<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
<SubVar>
<Name>AxisState</Name>
<Comment>
<![CDATA[Present State Of The Axis Movement (continuous axis):
0 = INACTIVE: axis has no job
1 = RUNNING: axis is executing a motion job
2 = OVERRIDE_ZERO: axis is executing a job but override is zero
3 = PHASE_VELOCONST: axis is moving at constant velocity
4 = PHASE_ACCPOS: axis is accelerating
5 = PHASE_ACCNEG: axis is decelerating
Slaves only:
11 = PREPHASE: slave axis is in a motion pre-phase
12 = SYNCHRONIZING: slave axis is synchronizing
13 = SYNCHRONOUS: slave axis is moving synchronously
External Setpoint Generation:
41 = EXTSETGEN_MODE1: external setpoint generation active
42 = EXTSETGEN_MODE2: internal and external setpoint gen. active
]]>
</Comment>
</SubVar>
<SubVar>
<Name>HomingState</Name>
<Comment>
<![CDATA[Axis Homing Status:
0: idle
1: start homing
2: searching home switch
3: stopping on home switch
4: moving off home switch
5: searching sync pulse
6: stopping after homing
]]>
</Comment>
</SubVar>
<SubVar>
<Name>CoupleState</Name>
<Comment>
<![CDATA[Axis Coupling Status:
0: axis is a single axis (not coupled)
1: axis is a master axis
2: axis is master and slave
3: axis is a slave axis
]]>
</Comment>
</SubVar>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[2].bLimitForwardEnable</Name>
<Comment>
<![CDATA[ NC Forward Limit Switch: TRUE if ok to move]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[2].bLimitBackwardEnable</Name>
<Comment>
<![CDATA[ NC Backward Limit Switch: TRUE if ok to move]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[2].bHome</Name>
<Comment>
<![CDATA[ NO Home Switch: TRUE if at home]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[2].bHardwareEnable</Name>
<Comment>
<![CDATA[ NC STO Input: TRUE if ok to move]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[2].nRawEncoderULINT</Name>
<Comment>
<![CDATA[ Raw encoder IO for ULINT (Biss-C)]]>
</Comment>
<Type>ULINT</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[2].nRawEncoderUINT</Name>
<Comment>
<![CDATA[ Raw encoder IO for UINT (Relative Encoders)]]>
</Comment>
<Type>UINT</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[2].nRawEncoderINT</Name>
<Comment>
<![CDATA[ Raw encoder IO for INT (LVDT)]]>
</Comment>
<Type>INT</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[3].Axis.NcToPlc</Name>
<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
<SubVar>
<Name>AxisState</Name>
<Comment>
<![CDATA[Present State Of The Axis Movement (continuous axis):
0 = INACTIVE: axis has no job
1 = RUNNING: axis is executing a motion job
2 = OVERRIDE_ZERO: axis is executing a job but override is zero
3 = PHASE_VELOCONST: axis is moving at constant velocity
4 = PHASE_ACCPOS: axis is accelerating
5 = PHASE_ACCNEG: axis is decelerating
Slaves only:
11 = PREPHASE: slave axis is in a motion pre-phase
12 = SYNCHRONIZING: slave axis is synchronizing
13 = SYNCHRONOUS: slave axis is moving synchronously
External Setpoint Generation:
41 = EXTSETGEN_MODE1: external setpoint generation active
42 = EXTSETGEN_MODE2: internal and external setpoint gen. active
]]>
</Comment>
</SubVar>
<SubVar>
<Name>HomingState</Name>
<Comment>
<![CDATA[Axis Homing Status:
0: idle
1: start homing
2: searching home switch
3: stopping on home switch
4: moving off home switch
5: searching sync pulse
6: stopping after homing
]]>
</Comment>
</SubVar>
<SubVar>
<Name>CoupleState</Name>
<Comment>
<![CDATA[Axis Coupling Status:
0: axis is a single axis (not coupled)
1: axis is a master axis
2: axis is master and slave
3: axis is a slave axis
]]>
</Comment>
</SubVar>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[3].bLimitForwardEnable</Name>
<Comment>
<![CDATA[ NC Forward Limit Switch: TRUE if ok to move]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[3].bLimitBackwardEnable</Name>
<Comment>
<![CDATA[ NC Backward Limit Switch: TRUE if ok to move]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[3].bHome</Name>
<Comment>
<![CDATA[ NO Home Switch: TRUE if at home]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[3].bHardwareEnable</Name>
<Comment>
<![CDATA[ NC STO Input: TRUE if ok to move]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[3].nRawEncoderULINT</Name>
<Comment>
<![CDATA[ Raw encoder IO for ULINT (Biss-C)]]>
</Comment>
<Type>ULINT</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[3].nRawEncoderUINT</Name>
<Comment>
<![CDATA[ Raw encoder IO for UINT (Relative Encoders)]]>
</Comment>
<Type>UINT</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[3].nRawEncoderINT</Name>
<Comment>
<![CDATA[ Raw encoder IO for INT (LVDT)]]>
</Comment>
<Type>INT</Type>
</Var>
<Var>
<Name>PRG_3_PMPS_POST.fbArbiterIO.i_stCurrentBP</Name>
<Type GUID="{292CD354-C7C0-4A61-AAD0-1C85DD69646B}">ST_BeamParams_IO</Type>
Expand Down Expand Up @@ -8469,11 +8763,40 @@ External Setpoint Generation:
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_PMPS.PMPS_ST4K4_IN</Name>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[1].Axis.PlcToNc</Name>
<Type GUID="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" Namespace="MC">PLCTONC_AXIS_REF</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[1].bBrakeRelease</Name>
<Comment>
<![CDATA[ NC Brake Output: TRUE to release brake]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_PMPS.PMPS_ST4K4_OUT</Name>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[2].Axis.PlcToNc</Name>
<Type GUID="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" Namespace="MC">PLCTONC_AXIS_REF</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[2].bBrakeRelease</Name>
<Comment>
<![CDATA[ NC Brake Output: TRUE to release brake]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[3].Axis.PlcToNc</Name>
<Type GUID="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" Namespace="MC">PLCTONC_AXIS_REF</Type>
</Var>
<Var>
<Name>PRG_SP1K4.fbATTStates.astMotionStageMax[3].bBrakeRelease</Name>
<Comment>
<![CDATA[ NC Brake Output: TRUE to release brake]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_PMPS.PMPS_ST4K4_IN</Name>
<Type>BOOL</Type>
</Var>
<Var>
Expand Down Expand Up @@ -8614,6 +8937,10 @@ External Setpoint Generation:
<Name>GVL_PMPS.fbFastFaultOutput2.q_xFastFaultOut</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_PMPS.PMPS_ST4K4_OUT</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>Main.M1.Axis.PlcToNc</Name>
<Type GUID="{63A84524-72E3-41C8-BEAB-4CCE44690A13}" Namespace="MC">PLCTONC_AXIS_REF</Type>
Expand Down
21 changes: 21 additions & 0 deletions plc-tmo-motion/tmo_motion/DUTs/ENUM_SolidAttenuator_States.TcDUT
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.18">
<DUT Name="ENUM_SolidAttenuator_States" Id="{a9b56f49-37af-4519-bf3c-f4ee10056eb1}">
<Declaration><![CDATA[{attribute 'qualified_only'}
{attribute 'strict'}
TYPE ENUM_SolidAttenuator_States :
(
Unknown := 0,
OUT := 1,
Target1 := 2,
Target2 := 3,
Target3 := 4,
Target4 := 5,
Target5 := 6
)UINT;
END_TYPE
]]></Declaration>
</DUT>
</TcPlcObject>
Loading

0 comments on commit 7abc07c

Please sign in to comment.