Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Joshc slac/ecseng 565 #44

Merged
merged 3 commits into from
Dec 13, 2024
Merged

Joshc slac/ecseng 565 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2fe695
feat(PMPS): added veto devices for MR1L[0,1] mirror states
Feb 28, 2024
6c6c489
maggie help
Feb 28, 2024
d101fdc
fixup: linking correct fastoutput and correcting comment
Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion plc_lfe_vac/plc_lfe_vac/plc_lfe_vac.tsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,8 @@
<ManualSelect>{3EBB9639-5FF3-42B6-8847-35C70DC013C8}</ManualSelect>
<ManualSelect>{6952449D-F68C-49A2-ADE4-8639D85B33A4}</ManualSelect>
<ManualSelect Instances="250">{103F30C9-DF25-439E-837B-9DF80CB9356C}</ManualSelect>
<ManualSelect>{B27B051A-CA6A-42EA-833E-82CC92903D83}</ManualSelect>
<ManualSelect>{E008E3C8-6BD9-491C-B673-DC45CC7AA4F1}</ManualSelect>
<ManualSelect>{B27B051A-CA6A-42EA-833E-82CC92903D83}</ManualSelect>
<TargetSelect TargetId="2">{3EBB9639-5FF3-42B6-8847-35C70DC013C8}</TargetSelect>
<TargetSelect TargetId="2">{E008E3C8-6BD9-491C-B673-DC45CC7AA4F1}</TargetSelect>
<LicenseDevice DongleHardwareId="2" DongleDevice="#x03020002" DongleSystemId="{B9B99F2E-0ADA-B904-40E6-1CE7729B83BB}"/>
Expand Down Expand Up @@ -2140,6 +2140,10 @@
<Name>GVL_LFE_VAC_PMPS.g_FastFaultOutput2.q_xFastFaultOut</Name>
<Type>BOOL</Type>
</Var>
<Var>
<Name>GVL_LFE_VAC_PMPS.g_FastFaultOutput4.q_xFastFaultOut</Name>
<Type>BOOL</Type>
</Var>
</Vars>
<Vars VarGrpType="8">
<Name>PlcTask Retains</Name>
Expand Down
5 changes: 5 additions & 0 deletions plc_lfe_vac/plc_lfe_vac/plc_lfe_vac/GVLs/GVL_LFE_VAC_PMPS.TcGVL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ VAR_GLOBAL
{attribute 'TcLinkTo' := '.q_xFastFaultOut:=TIIB[PLC_E1_EL2202]^Channel 2^Output'}
g_FastFaultOutput2 : FB_HardwareFFOutput :=(i_sNetID:='172.21.88.66.1.1'); //FFO for ST1L0_XTES's Downstream Components

{attribute 'pytmc' := '
pv: PLC:LFE:VAC:FFO:04
'}
g_FastFaultOutput4 : FB_HardwareFFOutput :=(i_sNetID:='172.21.88.66.1.1'); // FFO for valves that are downstream of the optics and upstream of ST1L1 on the L1 line.

{attribute 'pytmc' := '
pv: PLC:LFE:VAC:RESET:FF1
'}
Expand Down
4 changes: 2 additions & 2 deletions plc_lfe_vac/plc_lfe_vac/plc_lfe_vac/POUs/MAIN.TcPOU
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ XPP_DS_Gauge.rPRESS := XPP_Downstream_Gauge.rPRESS;//XPP_Modbus_Gauge.VG.rPRESS;
i_sDevName:= 'BT2L0:PLEG:VGC:01',
iq_stValve=> ,
xMPS_OK=> ,
io_fbFFHWO:= g_FastFaultOutput1,
io_fbFFHWO:= g_FastFaultOutput4, // TODO(josh): ask maggie if this is sufficient because we have connected the FF
Copy link
Author

@joshc-slac joshc-slac Mar 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ghalym you called out the one below, my assumption is this one also needed to be updated.

fbArbiter:= g_fbArbiter1 );

MR2L0_HOMS_VGC_01(
Expand Down Expand Up @@ -352,7 +352,7 @@ XPP_DS_Gauge.rPRESS := XPP_Downstream_Gauge.rPRESS;//XPP_Modbus_Gauge.VG.rPRESS;
i_sDevName:= 'TV1L1:VGC:01',
iq_stValve=> ,
xMPS_OK=> ,
io_fbFFHWO:= g_FastFaultOutput1,
io_fbFFHWO:= g_FastFaultOutput4,
fbArbiter := g_fbArbiter1 );


Expand Down
12 changes: 11 additions & 1 deletion plc_lfe_vac/plc_lfe_vac/plc_lfe_vac/POUs/PRG_PMPS.TcPOU
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
<Declaration><![CDATA[PROGRAM PRG_PMPS
VAR
fbArbiterIO : FB_SubSysToArbiter_IO;

fb_vetoArbiter: FB_VetoArbiter;
ff4_ff1_link_vac: FB_FastFault := (i_xAutoReset := TRUE, i_DevName := 'FF4 to FF1 Link', i_Desc := 'This is virtual FF4 fault, Please check the Group 4 faulting device ', i_TypeCode := 16#9999);
END_VAR
]]></Declaration>
<Implementation>
Expand All @@ -14,6 +15,15 @@ g_fbArbiter1.AddRequest(nReqID := 95 , stReqBp := PMPS_GVL.cstFullBeam, sDevName
(*FastFaultOuput*)
g_FastFaultOutput1.Execute(bAutoReset:= TRUE);
g_FastFaultOutput2.Execute(i_xVeto:=PMPS_GVL.stCurrentBeamParameters.aVetoDevices[PMPS.L_Stopper.ST1L0], bAutoReset:= TRUE);
g_FastFaultOutput4.Execute(i_xVeto:=PMPS_GVL.stCurrentBeamParameters.aVetoDevices[PMPS.L_Stopper.MR1L1_OUT] AND PMPS_GVL.stCurrentBeamParameters.aVetoDevices[PMPS.L_Stopper.MR1L0_L0], bAutoReset:= TRUE);

ff4_ff1_link_vac(
io_fbFFHWO := g_FastFaultOutput1,
i_xOK := g_FastFaultOutput4.q_xFastFaultOut);

fb_vetoArbiter( HigherAuthority := g_fbArbiter1,
FFO := g_FastFaultOutput1); // This should be the FFO upstream of the veto device
fbArbiterIO(Arbiter := g_fbArbiter1, fbFFHWO := g_FastFaultOutput1);

]]></ST>
</Implementation>
Expand Down
11 changes: 6 additions & 5 deletions plc_lfe_vac/plc_lfe_vac/plc_lfe_vac/plc_lfe_vac.plcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,6 @@
<DefaultResolution>LCLS Vacuum, * (SLAC - LCLS)</DefaultResolution>
<Namespace>LCLS_Vacuum</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 @@ -103,7 +99,7 @@
<Resolution>LCLS Vacuum, 2.3.0 (SLAC - LCLS)</Resolution>
</PlaceholderResolution>
<PlaceholderResolution Include="PMPS">
<Resolution>PMPS, 3.0.14 (SLAC - LCLS)</Resolution>
<Resolution>PMPS, * (SLAC - LCLS)</Resolution>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please make sure to set the effective version on the libraries. it has to point to a specific version and not set to newest.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lcls-plc-lfe-vac/plc_lfe_vac/plc_lfe_vac/plc_lfe_vac/plc_lfe_vac.plcproj

Lines 159 to 161 in 6c6c489

<LibraryReference Include="PMPS,3.2.1,SLAC - LCLS">
<Namespace>PMPS</Namespace>
</LibraryReference>

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://docs.google.com/presentation/d/1moIDgnQtO2f7veBoTfxUGaALhq8NSwQulQrYihWgLtE/edit?usp=sharing

From slides 39 and 40 I believe I did it correctly, though I see what you are calling out. Let me know if theres a way not enumerated in the documentation to do this

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Library shouldn't have been upgraded to the latest. Should have remained the same. I am seeing issues because of this now. You mentioned that these changes are deployed, But now i see that they aren't.

</PlaceholderResolution>
<PlaceholderResolution Include="SysDir">
<Resolution>SysDir, 3.5.8.0 (System)</Resolution>
Expand Down Expand Up @@ -159,6 +155,11 @@
<SubType>Content</SubType>
</None>
</ItemGroup>
<ItemGroup>
<LibraryReference Include="PMPS,3.2.1,SLAC - LCLS">
<Namespace>PMPS</Namespace>
</LibraryReference>
</ItemGroup>
<ProjectExtensions>
<PlcProjectOptions>
<XmlArchive>
Expand Down
Loading
Loading