Skip to content

Commit 1142688

Browse files
authored
Merge pull request #143 from ghalym/beamclass-nc-veto
FIX: ignore beamclas invalid reading in NC mode
2 parents 9d81b0c + 7ad1c91 commit 1142688

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lcls-twincat-pmps/PMPS/MajorComponents/FB_BeamClassFromEPICS.TcPOU

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ ELSE
5454
BP.nBeamClass := cFailSafeBC;
5555
END_IF
5656
BP.nBCRange := TO_WORD(BP.nBeamClass);
57-
58-
ffBeamClassReadback(i_xOK:=fbMPS_BeamClass.bValid, io_fbFFHWO:=FFO);
57+
// i_xOK is TRUE if we get a valid reading from epics or we are in NC mode, then we ignore the invalid reading.
58+
ffBeamClassReadback(i_xOK:= (fbMPS_BeamClass.bValid OR BP.nMachineMode = 0) , io_fbFFHWO:=FFO);
5959
6060
BP.xValid R= NOT fbMPS_BeamClass.bValid;]]></ST>
6161
</Implementation>
6262
</POU>
63-
</TcPlcObject>
63+
</TcPlcObject>

lcls-twincat-pmps/PMPS/PMPS.tmc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31620,7 +31620,7 @@ request loop (two arbiters elevating to each other), or there is a RequestAdd, R
3162031620
</Property>
3162131621
<Property>
3162231622
<Name>ChangeDate</Name>
31623-
<Value>2025-07-29T11:12:16</Value>
31623+
<Value>2025-12-16T08:53:46</Value>
3162431624
</Property>
3162531625
<Property>
3162631626
<Name>GeneratedCodeSize</Name>

0 commit comments

Comments
 (0)