Skip to content

Commit

Permalink
STY: run pre-commit all-files
Browse files Browse the repository at this point in the history
  • Loading branch information
nrwslac committed Aug 18, 2023
1 parent a4638db commit 1aa6436
Show file tree
Hide file tree
Showing 22 changed files with 233 additions and 233 deletions.
16 changes: 8 additions & 8 deletions plc-tmo-motion/tmo_motion/GVLs/GVL_PMPS.TcGVL
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.18">
<GVL Name="GVL_PMPS" Id="{9b94692b-5571-4165-bb98-ffe5b3549b86}">
<Declaration><![CDATA[VAR_GLOBAL
// Arbiter linked to the FFO and the MPS
{attribute 'pytmc' := 'pv: PLC:TMO:MOTION:ARB:01'}
fbArbiter: FB_Arbiter(1);
// Arbiter linked to the FFO and the MPS
// Arbiter linked to the FFO and the MPS
{attribute 'pytmc' := 'pv: PLC:TMO:MOTION:ARB:02'}
fbArbiter2: FB_Arbiter(2);
// Fast fault for before ST4K4 (Most Devices)
{attribute 'pytmc' := 'pv: PLC:TMO:MOTION:FFO:01'}
{attribute 'TcLinkTo' := '.q_xFastFaultOut:=TIIB[PMPS_FFO]^Channel 1^Output'}
Expand All @@ -19,11 +19,11 @@
{attribute 'pytmc' := 'pv: PLC:TMO:MOTION:FFO:02'}
{attribute 'TcLinkTo' := '.q_xFastFaultOut:=TIIB[PMPS_FFO]^Channel 2^Output'}
fbFastFaultOutput2: FB_HardwareFFOutput := (bAutoReset := TRUE, i_sNetID:='172.21.92.73.1.1');
{attribute 'TcLinkTo' := 'TIIB[PMPS_PRE]^IO Outputs^bST4K4_IN'}
PMPS_ST4K4_IN AT%Q* : BOOL;
{attribute 'TcLinkTo' := 'TIIB[PMPS_PRE]^IO Outputs^bST4K4_OUT'}
PMPS_ST4K4_OUT AT%Q* : BOOL;
{attribute 'TcLinkTo' := 'TIIB[PMPS_PRE]^IO Outputs^bST4K4_IN'}
PMPS_ST4K4_IN AT%Q* : BOOL;
{attribute 'TcLinkTo' := 'TIIB[PMPS_PRE]^IO Outputs^bST4K4_OUT'}
PMPS_ST4K4_OUT AT%Q* : BOOL;
END_VAR]]></Declaration>
</GVL>
</TcPlcObject>
130 changes: 65 additions & 65 deletions plc-tmo-motion/tmo_motion/POUs/FB_SP_ZP.TcPOU
Original file line number Diff line number Diff line change
Expand Up @@ -3,57 +3,57 @@
<POU Name="FB_SP_ZP" Id="{9e7633b7-c6b9-4709-92c4-d466b7628291}" SpecialFunc="None">
<Declaration><![CDATA[FUNCTION_BLOCK FB_SP_ZP
VAR_IN_out
stXStage: DUT_MotionStage;
stYStage: DUT_MotionStage;
stZStage: DUT_MotionStage;
stXStage: DUT_MotionStage;
stYStage: DUT_MotionStage;
stZStage: DUT_MotionStage;
fbArbiter: FB_Arbiter;
fbFFHWO: FB_HardwareFFOutput;
END_VAR
VAR_INPUT
stOut: DUT_PositionState;
stYag: DUT_PositionState;
stNe1: DUT_PositionState;
stNe2: DUT_PositionState;
stOut: DUT_PositionState;
stYag: DUT_PositionState;
stNe1: DUT_PositionState;
stNe2: DUT_PositionState;
stNe3: DUT_PositionState;
st3w1: DUT_PositionState;
st3w2: DUT_PositionState;
stO2: DUT_PositionState;
stO1: DUT_PositionState;
stTi1: DUT_PositionState;
stTi2: DUT_PositionState;
stN1: DUT_PositionState;
stN2:DUT_PositionState;
stC1: DUT_PositionState;
stC2: DUT_PositionState;
//nTransitionAssertionID: UDINT;
st3w2: DUT_PositionState;
stO2: DUT_PositionState;
stO1: DUT_PositionState;
stTi1: DUT_PositionState;
stTi2: DUT_PositionState;
stN1: DUT_PositionState;
stN2:DUT_PositionState;
stC1: DUT_PositionState;
stC2: DUT_PositionState;
//nTransitionAssertionID: UDINT;
//nUnknownAssertionID: UDINT;
{attribute 'pytmc' := '
{attribute 'pytmc' := '
pv: MMS:X:STATE
io: i
'}
fbStates_x: FB_ZonePlate_States;
{attribute 'pytmc' := '
{attribute 'pytmc' := '
pv: MMS:Y:STATE
io: i
'}
fbStates_y: FB_ZonePlate_States;
zp_enumSet : ENUM_ZonePlate_States;
zp_enumSet : ENUM_ZonePlate_States;
END_VAR
VAR
fbXStage: FB_MotionStage;
fbYStage: FB_MotionStage;
fbZStage: FB_MotionStage;
(*FFO*)
FFO: FB_fastFault :=(
i_DevName:= 'SP1K4',
i_Desc := 'Fault Occures when the X and Y states d not match',
i_TypeCode := 16#300 //todo find a type code on confluence
);
fbXStage: FB_MotionStage;
fbYStage: FB_MotionStage;
fbZStage: FB_MotionStage;
(*FFO*)
FFO: FB_fastFault :=(
i_DevName:= 'SP1K4',
i_Desc := 'Fault Occures when the X and Y states d not match',
i_TypeCode := 16#300 //todo find a type code on confluence
);
END_VAR
Expand Down Expand Up @@ -87,54 +87,54 @@ fbStates_X(
// nUnknownAssertionID:=nUnknownAssertionID,
stMotionStage:=stXStage,
bEnable:=TRUE,
enumSet:= zp_enumSet,
enumSet:= zp_enumSet,
stOut:=stOut,
stYag :=stYag,
stNe1:=stNe1,
stNe2:=stNe2,
stNe3:=stNe3,
st3w1:=st3w1,
st3w2:=st3w2,
stO2:=stO2,
stO1:=stO1,
stTi1:=stTi1,
stTi2:=stTi2,
stN1:=stN1,
stN2:=stN2,
stC1:=stC1,
stC2:=stC2,
stNe2:=stNe2,
stNe3:=stNe3,
st3w1:=st3w1,
st3w2:=st3w2,
stO2:=stO2,
stO1:=stO1,
stTi1:=stTi1,
stTi2:=stTi2,
stN1:=stN1,
stN2:=stN2,
stC1:=stC1,
stC2:=stC2,
); //TODO ADD all other states
fbStates_Y(
fbArbiter:=fbArbiter,
fbFFHWO:=fbFFHWO,
// nTransitionAssertionID:=nTransitionAssertionID,
// nUnknownAssertionID:=nUnknownAssertionID,
stMotionStage:=stYStage,
bEnable:=TRUE,
enumSet:= zp_enumSet,
enumSet:= zp_enumSet,
stOut:=stOut,
stYag:=stYag,
stNe1:=stNe1,
stNe2:=stNe2,
stNe3:=stNe3,
st3w1:=st3w1,
st3w2:=st3w2,
stO2:=stO2,
stO1:=stO1,
stTi1:=stTi1,
stTi2:=stTi2,
stN1:=stN1,
stN2:=stN2,
stC1:=stC1,
stC2:=stC2,
stNe2:=stNe2,
stNe3:=stNe3,
st3w1:=st3w1,
st3w2:=st3w2,
stO2:=stO2,
stO1:=stO1,
stTi1:=stTi1,
stTi2:=stTi2,
stN1:=stN1,
stN2:=stN2,
stC1:=stC1,
stC2:=stC2,
);
FFO(i_xOK:= (fbStates_X.enumGet = fbStates_Y.enumGet),
FFO(i_xOK:= (fbStates_X.enumGet = fbStates_Y.enumGet),
io_fbFFHWO:= fbFFHWO,
i_xAutoReset := TRUE );]]></ST>
</Implementation>
Expand Down
10 changes: 5 additions & 5 deletions plc-tmo-motion/tmo_motion/POUs/PRG_2_PMPS_PRE.TcPOU
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ END_VAR
]]></Declaration>
<Implementation>
<ST><![CDATA[MOTION_GVL.fbStandardPMPSDB(
io_fbFFHWO:=GVL_PMPS.fbFastFaultOutput1,
bEnable:=TRUE,
sPLCName:='plc-tmo-motion',
);
io_fbFFHWO:=GVL_PMPS.fbFastFaultOutput1,
bEnable:=TRUE,
sPLCName:='plc-tmo-motion',
);
]]></ST>
</Implementation>
</POU>
Expand Down
12 changes: 6 additions & 6 deletions plc-tmo-motion/tmo_motion/POUs/PRG_3_PMPS_POST.TcPOU
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@
<Declaration><![CDATA[PROGRAM PRG_3_PMPS_POST
VAR
fbArbiterIO: FB_SubSysToArbiter_IO;
fb_vetoArbiter: FB_VetoArbiter;
fb_vetoArbiter: FB_VetoArbiter;
bST3K4_Veto: BOOL;
bM1K1Veto: BOOL;
bST4K4_Veto:BOOL;
bM1K1Veto: BOOL;
bST4K4_Veto:BOOL;
END_VAR]]></Declaration>
<Implementation>
<ST><![CDATA[bST3K4_Veto := PMPS_GVL.stCurrentBeamParameters.aVetoDevices[PMPS.K_Stopper.ST3K4];
bST4K4_Veto := PMPS_GVL.stCurrentBeamParameters.aVetoDevices[PMPS.K_Stopper.ST4K4];
bM1K1Veto := NOT PMPS_GVL.stCurrentBeamParameters.aVetoDevices[PMPS.K_Stopper.MR1K1_OUT]
bM1K1Veto := NOT PMPS_GVL.stCurrentBeamParameters.aVetoDevices[PMPS.K_Stopper.MR1K1_OUT]
AND PMPS_GVL.stCurrentBeamParameters.aVetoDevices[PMPS.K_Stopper.MR1K1_IN];
fbArbiterIO(
i_bVeto:=bST3K4_Veto,
Arbiter:=fbArbiter,
fbFFHWO:=fbFastFaultOutput1);
fb_vetoArbiter(bVeto:=bST4K4_Veto OR bST3K4_Veto OR bM1K1Veto,
HigherAuthority := GVL_PMPS.fbArbiter,
LowerAuthority := GVL_PMPS.fbArbiter2,
FFO := GVL_PMPS.fbFastFaultOutput2);
FFO := GVL_PMPS.fbFastFaultOutput2);
fbFastFaultOutput1.Execute(i_xVeto:=bST3K4_Veto OR bM1K1Veto);
fbFastFaultOutput2.Execute(i_xVeto:=bST3K4_Veto OR bM1K1Veto OR bST4K4_Veto); // Eventually, also veto on ST4K4 using OR
Expand Down
4 changes: 2 additions & 2 deletions plc-tmo-motion/tmo_motion/POUs/PRG_AL1K4_L2SI.TcPOU
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ fbAL1K4(
stYStage := Main.M1,
fbArbiter := fbArbiter,
fbFFHWO := fbFastFaultOutput1,
sPmpsDeviceName := 'AL1K4:L2SI',
sTransitionKey := 'AL1K4:L2SI-TRANSITION',
sPmpsDeviceName := 'AL1K4:L2SI',
sTransitionKey := 'AL1K4:L2SI-TRANSITION',
);]]></ST>
</Implementation>
</POU>
Expand Down
4 changes: 2 additions & 2 deletions plc-tmo-motion/tmo_motion/POUs/PRG_IM3K4_PPM.TcPOU
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ fbIM3K4(
fbArbiter := fbArbiter,
fbFFHWO := fbFastFaultOutput1,
stYStage := Main.M15,
sPmpsDeviceName := 'IM3K4:PPM',
sTransitionKey := 'IM3K4:PPM-TRANSITION',
sPmpsDeviceName := 'IM3K4:PPM',
sTransitionKey := 'IM3K4:PPM-TRANSITION',
);]]></ST>
</Implementation>
</POU>
Expand Down
4 changes: 2 additions & 2 deletions plc-tmo-motion/tmo_motion/POUs/PRG_IM4K4_PPM.TcPOU
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ fbIM4K4(
fbArbiter := fbArbiter,
fbFFHWO := fbFastFaultOutput1,
stYStage := Main.M16,
sPmpsDeviceName := 'IM4K4:PPM',
sTransitionKey := 'IM4K4:PPM-TRANSITION',
sPmpsDeviceName := 'IM4K4:PPM',
sTransitionKey := 'IM4K4:PPM-TRANSITION',
);]]></ST>
</Implementation>
</POU>
Expand Down
4 changes: 2 additions & 2 deletions plc-tmo-motion/tmo_motion/POUs/PRG_IM5K4_PPM.TcPOU
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ fbIM5K4(
fbArbiter := fbArbiter,
fbFFHWO := fbFastFaultOutput1,
stYStage := Main.M17,
sPmpsDeviceName := 'IM5K4:PPM',
sTransitionKey := 'IM5K4:PPM-TRANSITION',
sPmpsDeviceName := 'IM5K4:PPM',
sTransitionKey := 'IM5K4:PPM-TRANSITION',
);]]></ST>
</Implementation>
Expand Down
6 changes: 3 additions & 3 deletions plc-tmo-motion/tmo_motion/POUs/PRG_IM6K4_PPM.TcPOU
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<POU Name="PRG_IM6K4_PPM" Id="{5922a5f4-dd07-4dd5-8bd1-7240efca9eab}" SpecialFunc="None">
<Declaration><![CDATA[PROGRAM PRG_IM6K4_PPM
VAR
{attribute 'pytmc' := '
{attribute 'pytmc' := '
pv: IM6K4:PPM
io: io
'}
Expand Down Expand Up @@ -52,8 +52,8 @@ fbIM6K4(
fbArbiter := fbArbiter2,
fbFFHWO := fbFastFaultOutput2,
stYStage := Main.M27,
sPmpsDeviceName := 'IM6K4:PPM',
sTransitionKey := 'IM6K4:PPM-TRANSITION',
sPmpsDeviceName := 'IM6K4:PPM',
sTransitionKey := 'IM6K4:PPM-TRANSITION',
);]]></ST>
</Implementation>
</POU>
Expand Down
4 changes: 2 additions & 2 deletions plc-tmo-motion/tmo_motion/POUs/PRG_LI1K4_IP1.TcPOU
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ VAR
fbLI1K4: FB_LIC;
stSiBP: ST_BeamParams := PMPS_GVL.cstFullBeam;
END_VAR
]]></Declaration>
<Implementation>
Expand Down Expand Up @@ -46,7 +46,7 @@ fbLI1K4(
fbFFHWO := fbFastFaultOutput1,
stYStage := Main.M20,
sPmpsDeviceName := 'LI1K4:IP1',
sTransitionKey := 'LI1K4:IP1-TRANSITION',
sTransitionKey := 'LI1K4:IP1-TRANSITION',
);
]]></ST>
</Implementation>
Expand Down
2 changes: 1 addition & 1 deletion plc-tmo-motion/tmo_motion/POUs/PRG_PF1K4_WFS_TARGET.TcPOU
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ fbPF1K4(
stYStage := Main.M18,
stZStage := Main.M19,
sPmpsDeviceName := 'PF1K4:WFS',
sTransitionKey := 'PF1K4:WFS-TRANSITION',
sTransitionKey := 'PF1K4:WFS-TRANSITION',
);
]]></ST>
</Implementation>
Expand Down
4 changes: 2 additions & 2 deletions plc-tmo-motion/tmo_motion/POUs/PRG_PF2K4_WFS_TARGET.TcPOU
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<POU Name="PRG_PF2K4_WFS_TARGET" Id="{eca3a9b8-cbcf-48fb-b835-0fd9af0cb164}" SpecialFunc="None">
<Declaration><![CDATA[PROGRAM PRG_PF2K4_WFS_TARGET
VAR
{attribute 'pytmc' := '
{attribute 'pytmc' := '
pv: PF2K4:WFS
io: io
'}
Expand Down Expand Up @@ -62,7 +62,7 @@ fbPF2K4(
stYStage := Main.M28,
stZStage := Main.M29,
sPmpsDeviceName := 'PF2K4:WFS',
sTransitionKey := 'PF2K4:WFS-TRANSITION',
sTransitionKey := 'PF2K4:WFS-TRANSITION',
);
]]></ST>
</Implementation>
Expand Down
4 changes: 2 additions & 2 deletions plc-tmo-motion/tmo_motion/POUs/PRG_ST4K4_TMO_TERM.TcPOU
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ END_VAR
ibCntrlHold:= TRUE,
ibOverrideInterlock:= ,
i_xReset:= ,
i_xAutoReset := TRUE,
i_xAutoReset := TRUE,
stPneumaticActuator=> ,
xMPS_OK=> ,
io_fbFFHWO:= fbFastFaultOutput2 ); // Do Stoppers send MPS FAULT?
// For PMPS Veto
GVL_PMPS.PMPS_ST4K4_IN := ST4K4.i_xInsertedLS;
GVL_PMPS.PMPS_ST4K4_OUT := ST4K4.i_xRetractedLS;]]></ST>
Expand Down
4 changes: 2 additions & 2 deletions plc-tmo-motion/tmo_motion/POUs/PRG_TM1K4.TcPOU
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ fbTM1K4(
fbFFHWO := fbFastFaultOutput1,
stYStage := Main.M21,
stXStage := Main.M22,
sPmpsDeviceName := 'TM1K4:ATM',
sTransitionKey := 'TM1K4:ATM-TRANSITION',
sPmpsDeviceName := 'TM1K4:ATM',
sTransitionKey := 'TM1K4:ATM-TRANSITION',
);
]]></ST>
</Implementation>
Expand Down
Loading

0 comments on commit 1aa6436

Please sign in to comment.