Skip to content

Commit

Permalink
Merge pull request pcdshub#109 from nrwslac/flow-switch-im2k4
Browse files Browse the repository at this point in the history 
IM2K4 Flow Switch
  • Loading branch information
@tongju12
tongju12 authored Dec 6, 2023
2 parents ea3643c + bb9c3b8 commit 962ce3a
Show file tree
Hide file tree
Showing 4 changed files with 1,987 additions and 1,599 deletions.
65 changes: 48 additions & 17 deletions plc-tmo-motion/_Config/PLC/tmo_motion.xti
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1936,6 +1936,10 @@ External Setpoint Generation:
<Name>PRG_IM2K4_PPM.fbIM2K4.fbYagThermoCouple.iRaw</Name>
<Type>INT</Type>
</Var>
<Var>
<Name>PRG_IM2K4_PPM.fbIM2K4.fbFlowSwitch.bFlowOk</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_IM3K4_PPM.fbIM3K4.fbYStage.fbDriveVirtual.MasterAxis.NcToPlc</Name>
<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
Expand Down Expand Up @@ -2336,6 +2340,10 @@ External Setpoint Generation:
<Name>PRG_IM3K4_PPM.fbIM3K4.fbYagThermoCouple.iRaw</Name>
<Type>INT</Type>
</Var>
<Var>
<Name>PRG_IM3K4_PPM.fbIM3K4.fbFlowSwitch.bFlowOk</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_IM4K4_PPM.fbIM4K4.fbYStage.fbDriveVirtual.MasterAxis.NcToPlc</Name>
<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
Expand Down Expand Up @@ -2736,6 +2744,10 @@ External Setpoint Generation:
<Name>PRG_IM4K4_PPM.fbIM4K4.fbYagThermoCouple.iRaw</Name>
<Type>INT</Type>
</Var>
<Var>
<Name>PRG_IM4K4_PPM.fbIM4K4.fbFlowSwitch.bFlowOk</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_IM5K4_PPM.fbIM5K4.fbYStage.fbDriveVirtual.MasterAxis.NcToPlc</Name>
<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
Expand Down Expand Up @@ -3136,6 +3148,10 @@ External Setpoint Generation:
<Name>PRG_IM5K4_PPM.fbIM5K4.fbYagThermoCouple.iRaw</Name>
<Type>INT</Type>
</Var>
<Var>
<Name>PRG_IM5K4_PPM.fbIM5K4.fbFlowSwitch.bFlowOk</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_IM6K4_PPM.fbIM6K4.fbYStage.fbDriveVirtual.MasterAxis.NcToPlc</Name>
<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
Expand Down Expand Up @@ -3536,6 +3552,10 @@ External Setpoint Generation:
<Name>PRG_IM6K4_PPM.fbIM6K4.fbYagThermoCouple.iRaw</Name>
<Type>INT</Type>
</Var>
<Var>
<Name>PRG_IM6K4_PPM.fbIM6K4.fbFlowSwitch.bFlowOk</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_LI1K4_IP1.fbLI1K4.fbYStage.fbDriveVirtual.MasterAxis.NcToPlc</Name>
<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
Expand Down Expand Up @@ -4303,6 +4323,10 @@ External Setpoint Generation:
<Name>PRG_PF1K4_WFS_TARGET.fbPF1K4.fbThermoCouple2.iRaw</Name>
<Type>INT</Type>
</Var>
<Var>
<Name>PRG_PF1K4_WFS_TARGET.fbPF1K4.fbFlowSwitch.bFlowOk</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_PF2K4_WFS_TARGET.fbPF2K4.fbYStage.fbDriveVirtual.MasterAxis.NcToPlc</Name>
<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
Expand Down Expand Up @@ -4727,6 +4751,10 @@ External Setpoint Generation:
<Name>PRG_PF2K4_WFS_TARGET.fbPF2K4.fbThermoCouple2.iRaw</Name>
<Type>INT</Type>
</Var>
<Var>
<Name>PRG_PF2K4_WFS_TARGET.fbPF2K4.fbFlowSwitch.bFlowOk</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_SL1K4_SCATTER.fbSL1K4.fbTopBlade.fbDriveVirtual.MasterAxis.NcToPlc</Name>
<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
Expand Down Expand Up @@ -5163,17 +5191,6 @@ External Setpoint Generation:
</Comment>
</SubVar>
</Var>
<Var>
<Name>PRG_ST4K4_TMO_TERM.ST4K4.i_xInsertedLS</Name>
<Comment>
<![CDATA[IO]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_ST4K4_TMO_TERM.ST4K4.i_xRetractedLS</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_SP1K4.bHallInput1</Name>
<Type>BOOL</Type>
Expand All @@ -5187,11 +5204,14 @@ External Setpoint Generation:
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_SP1K4.bTL1Low</Name>
<Name>PRG_ST4K4_TMO_TERM.ST4K4.i_xInsertedLS</Name>
<Comment>
<![CDATA[IO]]>
</Comment>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_SP1K4.bTL2High</Name>
<Name>PRG_ST4K4_TMO_TERM.ST4K4.i_xRetractedLS</Name>
<Type>BOOL</Type>
</Var>
<Var>
Expand Down Expand Up @@ -5308,6 +5328,14 @@ External Setpoint Generation:
<Name>PRG_TM1K4.fbTM1K4.fbThermoCouple1.iRaw</Name>
<Type>INT</Type>
</Var>
<Var>
<Name>PRG_SP1K4.bTL1Low</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_SP1K4.bTL2High</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_TM2K4.fbTM2K4.fbYStage.fbDriveVirtual.MasterAxis.NcToPlc</Name>
<Type GUID="{6A65C767-34E5-42BF-AD87-E1A503EAC7BE}" Namespace="MC">NCTOPLC_AXIS_REF</Type>
Expand Down Expand Up @@ -11789,6 +11817,10 @@ External Setpoint Generation:
<Name>GVL_PMPS.PMPS_ST4K4_IN</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_PMPS.PMPS_ST4K4_OUT</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>PRG_3_PMPS_POST.fbArbiterIO.q_stRequestedBP</Name>
<Type GUID="{292CD354-C7C0-4A61-AAD0-1C85DD69646B}">ST_BeamParams_IO</Type>
Expand Down Expand Up @@ -11927,10 +11959,6 @@ 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 Expand Up @@ -12489,6 +12517,9 @@ External Setpoint Generation:
<Link VarA="PlcTask Inputs^Main.M13.bLimitBackwardEnable" VarB="STM Status^Status^Digital input 2" AutoLink="true"/>
<Link VarA="PlcTask Inputs^Main.M13.bLimitForwardEnable" VarB="STM Status^Status^Digital input 1" AutoLink="true"/>
</OwnerB>
<OwnerB Name="TIID^Device 1 (EtherCAT)^Power (EK1200)^PLC Junction 1 (EK1122)^X2 TMO FEE EC2 (EK1100)^FEE EC2 E2 (EK1122)^X1 IM2K4-PPM (EK1100)^IM2K4-EL1004-E8">
<Link VarA="PlcTask Inputs^PRG_IM2K4_PPM.fbIM2K4.fbFlowSwitch.bFlowOk" VarB="Channel 1^Input" AutoLink="true"/>
</OwnerB>
<OwnerB Name="TIID^Device 1 (EtherCAT)^Power (EK1200)^PLC Junction 1 (EK1122)^X2 TMO FEE EC2 (EK1100)^FEE EC2 E2 (EK1122)^X1 IM2K4-PPM (EK1100)^IM2K4-EL2004-E3">
<Link VarA="PlcTask Outputs^Main.M9.bBrakeRelease" VarB="Channel 1^Output" AutoLink="true"/>
<Link VarA="PlcTask Outputs^PRG_IM2K4_PPM.fbIM2K4.fbGige.bGigePower" VarB="Channel 2^Output" AutoLink="true"/>
Expand Down
3 changes: 2 additions & 1 deletion plc-tmo-motion/tmo_motion/POUs/PRG_IM2K4_PPM.TcPOU
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ VAR
.fbYagThermoCouple.bError := TIIB[IM2K4-EL3314-E4]^TC Inputs Channel 2^Status^Error;
.fbYagThermoCouple.bUnderrange := TIIB[IM2K4-EL3314-E4]^TC Inputs Channel 2^Status^Underrange;
.fbYagThermoCouple.bOverrange := TIIB[IM2K4-EL3314-E4]^TC Inputs Channel 2^Status^Overrange;
.fbYagThermoCouple.iRaw := TIIB[IM2K4-EL3314-E4]^TC Inputs Channel 2^Value'}
.fbYagThermoCouple.iRaw := TIIB[IM2K4-EL3314-E4]^TC Inputs Channel 2^Value;
.fbFlowSwitch.bFlowOk := TIIB[IM2K4-EL1004-E8]^Channel 1^Input'}
fbIM2K4: FB_PPM;
// fStartupVelo: LREAL := 13;
fbStateSetup: FB_StateSetupHelper;
Expand Down
2 changes: 1 addition & 1 deletion plc-tmo-motion/tmo_motion/tmo_motion.plcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
<Resolution>LCLS General, 2.9.1 (SLAC)</Resolution>
</PlaceholderResolution>
<PlaceholderResolution Include="lcls-twincat-common-components">
<Resolution>lcls-twincat-common-components, 3.1.0 (SLAC)</Resolution>
<Resolution>lcls-twincat-common-components, 3.3.0 (SLAC)</Resolution>
</PlaceholderResolution>
<PlaceholderResolution Include="lcls-twincat-motion">
<Resolution>lcls-twincat-motion, 4.0.4 (SLAC)</Resolution>
Expand Down
Loading

0 comments on commit 962ce3a

Please sign in to comment.