Skip to content

FIX: ignore beamclas invalid reading in NC mode #143

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

Merged
ghalym merged 2 commits into from
Jan 5, 2026
Merged

FIX: ignore beamclas invalid reading in NC mode #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e583c28
FIX: ignore beamclas invalid reading in NC mode
ghalym Dec 16, 2025
7ad1c91
STY: Pre-commit
ghalym Dec 16, 2025
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: 3 additions & 3 deletions lcls-twincat-pmps/PMPS/MajorComponents/FB_BeamClassFromEPICS.TcPOU
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ ELSE
BP.nBeamClass := cFailSafeBC;
END_IF
BP.nBCRange := TO_WORD(BP.nBeamClass);

ffBeamClassReadback(i_xOK:=fbMPS_BeamClass.bValid, io_fbFFHWO:=FFO);
// i_xOK is TRUE if we get a valid reading from epics or we are in NC mode, then we ignore the invalid reading.
ffBeamClassReadback(i_xOK:= (fbMPS_BeamClass.bValid OR BP.nMachineMode = 0) , io_fbFFHWO:=FFO);

BP.xValid R= NOT fbMPS_BeamClass.bValid;]]></ST>
</Implementation>
</POU>
</TcPlcObject>
</TcPlcObject>
2 changes: 1 addition & 1 deletion lcls-twincat-pmps/PMPS/PMPS.tmc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31620,7 +31620,7 @@ request loop (two arbiters elevating to each other), or there is a RequestAdd, R
</Property>
<Property>
<Name>ChangeDate</Name>
<Value>2025-07-29T11:12:16</Value>
<Value>2025-12-16T08:53:46</Value>
</Property>
<Property>
<Name>GeneratedCodeSize</Name>
Expand Down