Skip to content

Commit

Permalink
Merge pull request pcdshub#7 from slactjohnson/assemblies
Browse files Browse the repository at this point in the history
Assemblies
  • Loading branch information
slactjohnson authored May 27, 2021
2 parents d7f35c6 + 327a244 commit 8c0a9da
Show file tree
Hide file tree
Showing 36 changed files with 6,108 additions and 2,242 deletions.
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4020.14">
<GVL Name="GVL_DPADDLE" Id="{14852951-363f-4764-8553-afbd56890d2f}">
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.6">
<GVL Name="GVL_DiagnosticPaddle" Id="{14852951-363f-4764-8553-afbd56890d2f}">
<Declaration><![CDATA[VAR_GLOBAL
// Motor axes
stDPXMotor : DUT_MotionStage;
stDPYMotor : DUT_MotionStage;
stDPZMotor : DUT_MotionStage;
// Define axis states for each axis. These are fed to a FB_PositionState manager for each axis
// X axis position states
Expand Down
50 changes: 50 additions & 0 deletions lcls-plc-crixs-motion/Motion/GVLs/GVL_Illumination.TcGVL
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.6">
<GVL Name="GVL_Illumination" Id="{2131cdf9-2472-4c34-9c96-7eac2d13e49a}">
<Declaration><![CDATA[//{attribute 'qualified_only'}
VAR_GLOBAL
// Define axis states for each axis. These are fed to a FB_PositionState manager for each axis
// X axis position states
stILMXPosPark : DUT_PositionState := (sName:= 'PARK',
fPosition := 0.0,
fDelta:=1.0,
fVelocity:=5.0,
fAccel:=1.0,
fDecel:=1.0,
bMoveOk:=FALSE,
bLocked:=TRUE,
bValid:=TRUE);
// Y axis position states
stILMYPosPark : DUT_PositionState := (sName:= 'PARK',
fPosition := 0.0,
fDelta:=1.0,
fVelocity:=5.0,
fAccel:=1.0,
fDecel:=1.0,
bMoveOk:=FALSE,
bLocked:=TRUE,
bValid:=TRUE);
// Z axis position states
stILMZPosPark : DUT_PositionState := (sName:= 'PARK',
fPosition := 0.0,
fDelta:=1.0,
fVelocity:=5.0,
fAccel:=1.0,
fDecel:=1.0,
bMoveOk:=FALSE,
bLocked:=TRUE,
bValid:=TRUE);
fbILMXStage : FB_MotionStage;
fbILMYStage : FB_MotionStage;
fbILMZStage : FB_MotionStage;
END_VAR]]></Declaration>
</GVL>
</TcPlcObject>
6 changes: 2 additions & 4 deletions lcls-plc-crixs-motion/Motion/GVLs/GVL_OBJECTIVES.TcGVL
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.6">
<GVL Name="GVL_OBJECTIVES" Id="{e102570a-198c-4e35-93e1-0893aecdf0c8}">
<GVL Name="GVL_Objectives" Id="{e102570a-198c-4e35-93e1-0893aecdf0c8}">
<Declaration><![CDATA[{attribute 'qualified_only'}
VAR_GLOBAL
// Motor axes
stOBJXMotor : DUT_MotionStage;
stOBJYMotor : DUT_MotionStage;
stOBJZMotor : DUT_MotionStage;
// Define axis states for each axis. These are fed to a FB_PositionState manager for each axis
// X axis position states
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.6">
<GVL Name="GVL_POINTDET" Id="{2d606824-f2da-4160-a460-fdf32c9c572a}">
<GVL Name="GVL_PointDetector" Id="{2d606824-f2da-4160-a460-fdf32c9c572a}">
<Declaration><![CDATA[{attribute 'qualified_only'}
VAR_GLOBAL
// Motor axes
stPDRotMotor : DUT_MotionStage;
stPDYMotor : DUT_MotionStage;
// Define axis states for each axis. These are fed to a FB_PositionState manager for each axis
// Rotation axis position states
Expand Down
5 changes: 2 additions & 3 deletions lcls-plc-crixs-motion/Motion/GVLs/GVL_QUESTAR.TcGVL
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.6">
<GVL Name="GVL_QUESTAR" Id="{556821e8-1021-4e81-85c0-f4ee820e2aed}">
<GVL Name="GVL_Questar" Id="{556821e8-1021-4e81-85c0-f4ee820e2aed}">
<Declaration><![CDATA[{attribute 'qualified_only'}
VAR_GLOBAL
// Motor axes
stQSTXMotor : DUT_MotionStage;
stQSTYMotor : DUT_MotionStage;
// Define axis states for each axis. These are fed to a FB_PositionState manager for each axis
// X axis position states
Expand Down
8 changes: 2 additions & 6 deletions lcls-plc-crixs-motion/Motion/GVLs/GVL_SAMPLEDELIVERY.TcGVL
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.6">
<GVL Name="GVL_SAMPLEDELIVERY" Id="{10fb3c1e-8547-4b7f-87b1-7ef61f33222d}">
<GVL Name="GVL_SampleDelivery" Id="{10fb3c1e-8547-4b7f-87b1-7ef61f33222d}">
<Declaration><![CDATA[{attribute 'qualified_only'}
VAR_GLOBAL
// Motor axes
stSDSXMotor : DUT_MotionStage;
stSDSYMotor : DUT_MotionStage;
stSDSZMotor : DUT_MotionStage;
stSDSRotMotor : DUT_MotionStage;
stSDSShroudMotor : DUT_MotionStage;
// Define axis states for each axis. These are fed to a FB_PositionState manager for each axis
// X axis position states
Expand Down
46 changes: 46 additions & 0 deletions lcls-plc-crixs-motion/Motion/GVLs/Main.TcGVL
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.6">
<GVL Name="Main" Id="{743c36cb-e5dd-4408-91ed-5169699d82d2}">
<Declaration><![CDATA[//{attribute 'qualified_only'}
VAR_GLOBAL
// Motor axes
{attribute 'pytmc' := 'pv: CRIX:DPL:MMS:X'}
{attribute 'TcLinkTo' := '.bLimitForwardEnable := TIID^Device 1 (EtherCAT)^Term 5 (EK1200)^Term 6 (EK1122-0080)^DRL02-EK0 (EK1101-0080)^DRL02-E1 (EL7031)^STM Status^Status^Digital input 1;
.bLimitBackwardEnable := TIID^Device 1 (EtherCAT)^Term 5 (EK1200)^Term 6 (EK1122-0080)^DRL02-EK0 (EK1101-0080)^DRL02-E1 (EL7031)^STM Status^Status^Digital input 2'}
stDPXMotor : DUT_MotionStage;
{attribute 'pytmc' := 'pv: CRIX:DPL:MMS:Y'}
{attribute 'TcLinkTo' := '.bLimitForwardEnable := TIID^Device 1 (EtherCAT)^Term 5 (EK1200)^Term 6 (EK1122-0080)^DRL02-EK0 (EK1101-0080)^DRL02-E3 (EL7031)^STM Status^Status^Digital input 1;
.bLimitBackwardEnable := TIID^Device 1 (EtherCAT)^Term 5 (EK1200)^Term 6 (EK1122-0080)^DRL02-EK0 (EK1101-0080)^DRL02-E3 (EL7031)^STM Status^Status^Digital input 2'}
stDPYMotor : DUT_MotionStage;
{attribute 'pytmc' := 'pv: CRIX:DPL:MMS:Z'}
{attribute 'TcLinkTo' := '.bLimitForwardEnable := TIID^Device 1 (EtherCAT)^Term 5 (EK1200)^Term 6 (EK1122-0080)^DRL02-EK0 (EK1101-0080)^DRL02-E4 (EL7031)^STM Status^Status^Digital input 1;
.bLimitBackwardEnable := TIID^Device 1 (EtherCAT)^Term 5 (EK1200)^Term 6 (EK1122-0080)^DRL02-EK0 (EK1101-0080)^DRL02-E4 (EL7031)^STM Status^Status^Digital input 2'}
stDPZMotor : DUT_MotionStage;
stILMXMotor : DUT_MotionStage;
stILMYMotor : DUT_MotionStage;
stILMZMotor : DUT_MotionStage;
stOBJXMotor : DUT_MotionStage;
stOBJYMotor : DUT_MotionStage;
stOBJZMotor : DUT_MotionStage;
stPDRotMotor : DUT_MotionStage;
stPDYMotor : DUT_MotionStage;
stQSTXMotor : DUT_MotionStage;
stQSTYMotor : DUT_MotionStage;
stSDSXMotor : DUT_MotionStage;
stSDSYMotor : DUT_MotionStage;
stSDSZMotor : DUT_MotionStage;
stSDSRotMotor : DUT_MotionStage;
stSDSShroudMotor : DUT_MotionStage;
END_VAR]]></Declaration>
</GVL>
</TcPlcObject>
34 changes: 22 additions & 12 deletions lcls-plc-crixs-motion/Motion/Motion.plcproj
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,31 @@
<SubType>Code</SubType>
<LinkAlways>true</LinkAlways>
</Compile>
<Compile Include="GVLs\GVL_DPADDLE.TcGVL">
<Compile Include="GVLs\GVL_DiagnosticPaddle.TcGVL">
<SubType>Code</SubType>
<LinkAlways>true</LinkAlways>
</Compile>
<Compile Include="GVLs\GVL_OBJECTIVES.TcGVL">
<Compile Include="GVLs\GVL_Illumination.TcGVL">
<SubType>Code</SubType>
<LinkAlways>true</LinkAlways>
</Compile>
<Compile Include="GVLs\GVL_POINTDET.TcGVL">
<Compile Include="GVLs\GVL_Objectives.TcGVL">
<SubType>Code</SubType>
<LinkAlways>true</LinkAlways>
</Compile>
<Compile Include="GVLs\GVL_QUESTAR.TcGVL">
<Compile Include="GVLs\GVL_PointDetector.TcGVL">
<SubType>Code</SubType>
<LinkAlways>true</LinkAlways>
</Compile>
<Compile Include="GVLs\GVL_SAMPLEDELIVERY.TcGVL">
<Compile Include="GVLs\GVL_Questar.TcGVL">
<SubType>Code</SubType>
<LinkAlways>true</LinkAlways>
</Compile>
<Compile Include="GVLs\GVL_SampleDelivery.TcGVL">
<SubType>Code</SubType>
<LinkAlways>true</LinkAlways>
</Compile>
<Compile Include="GVLs\Main.TcGVL">
<SubType>Code</SubType>
<LinkAlways>true</LinkAlways>
</Compile>
Expand All @@ -71,12 +79,15 @@
<Compile Include="POUs\Assemblies\FB_DPX.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\Assemblies\PRG_CRYOPUMPS.TcPOU">
<Compile Include="POUs\Assemblies\PRG_Cryopumps.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\Assemblies\PRG_DiagnosticPaddle.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\Assemblies\PRG_DiagnosticPaddleMotors.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\Assemblies\PRG_Illumination.TcPOU">
<SubType>Code</SubType>
</Compile>
Expand All @@ -101,7 +112,7 @@
<Compile Include="POUs\EPS\PRG_Test_AdjacentStates.TcPOU">
<SubType>Code</SubType>
</Compile>
<Compile Include="POUs\Main.TcPOU">
<Compile Include="POUs\PRG_Main.TcPOU">
<SubType>Code</SubType>
</Compile>
</ItemGroup>
Expand All @@ -120,6 +131,10 @@
<DefaultResolution>lcls-twincat-motion, * (SLAC)</DefaultResolution>
<Namespace>lcls_twincat_motion</Namespace>
</PlaceholderReference>
<PlaceholderReference Include="PMPS">
<DefaultResolution>PMPS, * (SLAC - LCLS)</DefaultResolution>
<Namespace>PMPS</Namespace>
</PlaceholderReference>
<PlaceholderReference Include="Tc2_Standard">
<DefaultResolution>Tc2_Standard, * (Beckhoff Automation GmbH)</DefaultResolution>
<Namespace>Tc2_Standard</Namespace>
Expand All @@ -138,11 +153,6 @@
<SubType>Content</SubType>
</None>
</ItemGroup>
<ItemGroup>
<PlaceholderResolution Include="lcls-twincat-motion">
<Resolution>lcls-twincat-motion, * (SLAC)</Resolution>
</PlaceholderResolution>
</ItemGroup>
<ProjectExtensions>
<PlcProjectOptions>
<XmlArchive>
Expand Down
Loading

0 comments on commit 8c0a9da

Please sign in to comment.