Skip to content

Commit a0df1fa

Browse files
author
github-actions
committed
Auto-update from Github Actions Workflow
Deployed from commit 9d81b0c (refs/heads/master) Deployed from commit 1142688 (refs/heads/master)
1 parent 63a5d39 commit a0df1fa

13 files changed

+18
-20
lines changed

‎master/_sources/lcls-twincat-pmps_PMPS_source.rst.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2014,7 +2014,6 @@ F_DifferentBeamParams
20142014
END_VAR
20152015
VAR
20162016
xAttOK: BOOL := FALSE;
2017-
xPPmjOK: BOOL := FALSE;
20182017
xEvOK: BOOL := FALSE;
20192018
xRateOK: BOOL := FALSE;
20202019
xaStopper : BOOL := FALSE;
@@ -2049,7 +2048,7 @@ F_DifferentBeamParams
20492048
END_FOR
20502049

20512050

2052-
F_DifferentBeamParams := xAttOK OR xPPmjOK OR xEvOK OR xRateOK OR xaStopper OR xaAtt OR xaApt OR xBCOK;
2051+
F_DifferentBeamParams := xAttOK OR xEvOK OR xRateOK OR xaStopper OR xaAtt OR xaApt OR xBCOK;
20532052

20542053
END_FUNCTION
20552054

@@ -3818,8 +3817,8 @@ FB_BeamClassFromEPICS
38183817
BP.nBeamClass := cFailSafeBC;
38193818
END_IF
38203819
BP.nBCRange := TO_WORD(BP.nBeamClass);
3821-
3822-
ffBeamClassReadback(i_xOK:=fbMPS_BeamClass.bValid, io_fbFFHWO:=FFO);
3820+
// i_xOK is TRUE if we get a valid reading from epics or we are in NC mode, then we ignore the invalid reading.
3821+
ffBeamClassReadback(i_xOK:= (fbMPS_BeamClass.bValid OR BP.nMachineMode = 0) , io_fbFFHWO:=FFO);
38233822

38243823
BP.xValid R= NOT fbMPS_BeamClass.bValid;
38253824

‎master/genindex.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ <h1 id="index">Index</h1>
101101
<hr/>
102102

103103
<div role="contentinfo">
104-
<p>&#169; Copyright 2025, SLAC National Accelerator Laboratory.</p>
104+
<p>&#169; Copyright 2026, SLAC National Accelerator Laboratory.</p>
105105
</div>
106106

107107
Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a

‎master/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ <h2>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Li
301301
<hr/>
302302

303303
<div role="contentinfo">
304-
<p>&#169; Copyright 2025, SLAC National Accelerator Laboratory.</p>
304+
<p>&#169; Copyright 2026, SLAC National Accelerator Laboratory.</p>
305305
</div>
306306

307307
Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a

‎master/lcls-twincat-pmps_PMPS_epics.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20467,7 +20467,7 @@ <h1>Database Records<a class="headerlink" href="#database-records" title="Link t
2046720467
<hr/>
2046820468

2046920469
<div role="contentinfo">
20470-
<p>&#169; Copyright 2025, SLAC National Accelerator Laboratory.</p>
20470+
<p>&#169; Copyright 2026, SLAC National Accelerator Laboratory.</p>
2047120471
</div>
2047220472

2047320473
Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a

‎master/lcls-twincat-pmps_PMPS_source.html‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2097,7 +2097,6 @@ <h2>F_DifferentBeamParams<a class="headerlink" href="#f-differentbeamparams" tit
20972097
END_VAR
20982098
VAR
20992099
xAttOK: BOOL := FALSE;
2100-
xPPmjOK: BOOL := FALSE;
21012100
xEvOK: BOOL := FALSE;
21022101
xRateOK: BOOL := FALSE;
21032102
xaStopper : BOOL := FALSE;
@@ -2132,7 +2131,7 @@ <h2>F_DifferentBeamParams<a class="headerlink" href="#f-differentbeamparams" tit
21322131
END_FOR
21332132

21342133

2135-
F_DifferentBeamParams := xAttOK OR xPPmjOK OR xEvOK OR xRateOK OR xaStopper OR xaAtt OR xaApt OR xBCOK;
2134+
F_DifferentBeamParams := xAttOK OR xEvOK OR xRateOK OR xaStopper OR xaAtt OR xaApt OR xBCOK;
21362135

21372136
END_FUNCTION
21382137
</pre></div>
@@ -3893,8 +3892,8 @@ <h2>FB_BeamClassFromEPICS<a class="headerlink" href="#fb-beamclassfromepics" tit
38933892
<span class="n">BP</span><span class="o">.</span><span class="n">nBeamClass</span> <span class="o">:=</span> <span class="n">cFailSafeBC</span><span class="p">;</span>
38943893
<span class="n">END_IF</span>
38953894
<span class="n">BP</span><span class="o">.</span><span class="n">nBCRange</span> <span class="o">:=</span> <span class="n">TO_WORD</span><span class="p">(</span><span class="n">BP</span><span class="o">.</span><span class="n">nBeamClass</span><span class="p">);</span>
3896-
3897-
<span class="n">ffBeamClassReadback</span><span class="p">(</span><span class="n">i_xOK</span><span class="o">:=</span><span class="n">fbMPS_BeamClass</span><span class="o">.</span><span class="n">bValid</span><span class="p">,</span> <span class="n">io_fbFFHWO</span><span class="o">:=</span><span class="n">FFO</span><span class="p">);</span>
3895+
<span class="o">//</span> <span class="n">i_xOK</span> <span class="ow">is</span> <span class="n">TRUE</span> <span class="k">if</span> <span class="n">we</span> <span class="n">get</span> <span class="n">a</span> <span class="n">valid</span> <span class="n">reading</span> <span class="kn">from</span><span class="w"> </span><span class="nn">epics</span> <span class="ow">or</span> <span class="n">we</span> <span class="n">are</span> <span class="ow">in</span> <span class="n">NC</span> <span class="n">mode</span><span class="p">,</span> <span class="n">then</span> <span class="n">we</span> <span class="n">ignore</span> <span class="n">the</span> <span class="n">invalid</span> <span class="n">reading</span><span class="o">.</span>
3896+
<span class="n">ffBeamClassReadback</span><span class="p">(</span><span class="n">i_xOK</span><span class="o">:=</span> <span class="p">(</span><span class="n">fbMPS_BeamClass</span><span class="o">.</span><span class="n">bValid</span> <span class="n">OR</span> <span class="n">BP</span><span class="o">.</span><span class="n">nMachineMode</span> <span class="o">=</span> <span class="mi">0</span><span class="p">)</span> <span class="p">,</span> <span class="n">io_fbFFHWO</span><span class="o">:=</span><span class="n">FFO</span><span class="p">);</span>
38983897

38993898
<span class="n">BP</span><span class="o">.</span><span class="n">xValid</span> <span class="n">R</span><span class="o">=</span> <span class="n">NOT</span> <span class="n">fbMPS_BeamClass</span><span class="o">.</span><span class="n">bValid</span><span class="p">;</span>
39003899

@@ -10361,7 +10360,7 @@ <h2>PE_Ranges<a class="headerlink" href="#pe-ranges" title="Link to this heading
1036110360
<hr/>
1036210361

1036310362
<div role="contentinfo">
10364-
<p>&#169; Copyright 2025, SLAC National Accelerator Laboratory.</p>
10363+
<p>&#169; Copyright 2026, SLAC National Accelerator Laboratory.</p>
1036510364
</div>
1036610365

1036710366
Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a

‎master/lcls-twincat-pmps_PMPS_summary.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1810,7 +1810,7 @@ <h2>TwinCAT_SystemInfoVarList<a class="headerlink" href="#twincat-systeminfovarl
18101810
<hr/>
18111811

18121812
<div role="contentinfo">
1813-
<p>&#169; Copyright 2025, SLAC National Accelerator Laboratory.</p>
1813+
<p>&#169; Copyright 2026, SLAC National Accelerator Laboratory.</p>
18141814
</div>
18151815

18161816
Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a

‎master/lcls-twincat-pmps_boxes.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ <h1>Boxes<a class="headerlink" href="#boxes" title="Link to this heading"></a
105105
<hr/>
106106

107107
<div role="contentinfo">
108-
<p>&#169; Copyright 2025, SLAC National Accelerator Laboratory.</p>
108+
<p>&#169; Copyright 2026, SLAC National Accelerator Laboratory.</p>
109109
</div>
110110

111111
Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a

‎master/lcls-twincat-pmps_ethercat.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ <h1>EtherCAT Terminals<a class="headerlink" href="#ethercat-terminals" title="Li
108108
<hr/>
109109

110110
<div role="contentinfo">
111-
<p>&#169; Copyright 2025, SLAC National Accelerator Laboratory.</p>
111+
<p>&#169; Copyright 2026, SLAC National Accelerator Laboratory.</p>
112112
</div>
113113

114114
Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a

‎master/lcls-twincat-pmps_links.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ <h1>Links<a class="headerlink" href="#links" title="Link to this heading"></a
105105
<hr/>
106106

107107
<div role="contentinfo">
108-
<p>&#169; Copyright 2025, SLAC National Accelerator Laboratory.</p>
108+
<p>&#169; Copyright 2026, SLAC National Accelerator Laboratory.</p>
109109
</div>
110110

111111
Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a

‎master/lcls-twincat-pmps_nc.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ <h1>NC Settings<a class="headerlink" href="#nc-settings" title="Link to this hea
105105
<hr/>
106106

107107
<div role="contentinfo">
108-
<p>&#169; Copyright 2025, SLAC National Accelerator Laboratory.</p>
108+
<p>&#169; Copyright 2026, SLAC National Accelerator Laboratory.</p>
109109
</div>
110110

111111
Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a

0 commit comments

Comments
 (0)