Auto-update from Github Actions Workflow

Deployed from commit e54ab3e (refs/tags/v3.9.0) Deployed from commit e54ab3e (refs/tags/v3.9.0)
pcdshub · Feb 12, 2025 · 7f47b54 · 7f47b54
1 parent c837277
commit 7f47b54
Show file tree

Hide file tree

Showing 11 changed files with 3,740 additions and 3,851 deletions.
diff --git a/v3.9.0/_sources/lcls-plc-rixs-optics_nc.rst.txt b/v3.9.0/_sources/lcls-plc-rixs-optics_nc.rst.txt
@@ -215,7 +215,6 @@ Axis 5: M1K2-Pitch
     Enc:Offset, -25648.08
     Enc:ScaleFactorNumerator, 0.00256
     Enc:SoftEndMaxControl:Enable, true
-    Enc:SoftEndMaxControl:Range, -25
     Enc:SoftEndMinControl:Enable, true
     Enc:SoftEndMinControl:Range, -350
     General:UnitName, urad

diff --git a/v3.9.0/_sources/lcls-plc-rixs-optics_pragmas.rst.txt b/v3.9.0/_sources/lcls-plc-rixs-optics_pragmas.rst.txt
@@ -6,7 +6,7 @@ Pragmas
     :header: PLC Name, Total Pragmas, Errors
     :align: center
 
-    :ref:`rixs_optics <rixs_optics_overview_pragmas>`, 351, 0
+    :ref:`rixs_optics <rixs_optics_overview_pragmas>`, 350, 0
 
 
 .. _rixs_optics_overview_pragmas:
@@ -15,7 +15,7 @@ Pragmas
 rixs_optics
 ^^^^^^^^^^^
 
-Total pragmas found: 351
+Total pragmas found: 350
 Total linter errors: 0
 
 
diff --git a/v3.9.0/_sources/lcls-plc-rixs-optics_rixs_optics_epics.rst.txt b/v3.9.0/_sources/lcls-plc-rixs-optics_rixs_optics_epics.rst.txt
@@ -59260,36 +59260,6 @@ Database Records
       - | io: input
 
 
-    * - MR1K1:BEND:ENC:PITCH:ACTPOSARRAY_RBV
-      - waveform
-      - PRG_MR1K1_BEND.fbPitchRMSErrorM1K1.aEncActPos
-      - | io: input
-
-
-    * - MR1K1:BEND:ENC:PITCH:SETPOSARRAY_RBV
-      - waveform
-      - PRG_MR1K1_BEND.fbPitchRMSErrorM1K1.aEncSetPos
-      - | io: input
-
-
-    * - MR1K1:BEND:ENC:PITCH:RMS_RBV
-      - ai
-      - PRG_MR1K1_BEND.fbPitchRMSErrorM1K1.fCurrRMSError
-      - | io: input
-
-
-    * - MR1K1:BEND:ENC:PITCH:MEAN_RBV
-      - ai
-      - PRG_MR1K1_BEND.fbPitchRMSErrorM1K1.fEncMean
-      - | io: input
-
-
-    * - MR1K1:BEND:ENC:PITCH:STDEV_RBV
-      - ai
-      - PRG_MR1K1_BEND.fbPitchRMSErrorM1K1.fEncStDev
-      - | io: input
-
-
     * - MR1K1:BEND:ENC:X:ACTPOSARRAY_RBV
       - waveform
       - PRG_MR1K1_BEND.fbXRMSErrorM1K1.aEncActPos

diff --git a/v3.9.0/_sources/lcls-plc-rixs-optics_rixs_optics_source.rst.txt b/v3.9.0/_sources/lcls-plc-rixs-optics_rixs_optics_source.rst.txt
@@ -1833,13 +1833,6 @@ PRG_MR1K1_BEND
         fMaxXRMSErrorM1K1 : LREAL;
         fMinXRMSErrorM1K1 : LREAL;
 
-        {attribute 'pytmc' := '
-            pv: MR1K1:BEND:ENC:PITCH
-        '}
-        fbPitchRMSErrorM1K1 : FB_RMSWatch;
-        fMaxPitchRMSErrorM1K1 : LREAL;
-        fMinPitchRMSErrorM1K1 : LREAL;
-
         // Pitch Control
         fbM1K1PitchControl : FB_PitchControl;
         bM1K1PitchDone : BOOL;
@@ -2051,10 +2044,6 @@ PRG_MR1K1_BEND
                     fMaxRMSError=>fMaxXRMSErrorM1K1,
                     fMinRMSError=>fMinXRMSErrorM1K1);
 
-    fbPitchRMSErrorM1K1(stMotionStage:=M16,
-                        fMaxRMSError=>fMaxPitchRMSErrorM1K1,
-                        fMinRMSError=>fMinPitchRMSErrorM1K1);
-
     (*
     // Pitch Control
     fbM1K1PitchControl(Pitch:=GVL_M1K1.M1K1_Pitch,
@@ -4238,7 +4227,7 @@ PRG_Stats
         fGpiRangeMax := MAX(fGpiRangeMax, fbGpiPosDiffStats.fRange);
     END_IF
 
-    fGpiEncoderPosDiff := M7.nEncoderCount - (M7.Axis.NcToPlc.SetPos - M7.stAxisParameters.fEncOffset) * 150;
+    fGpiEncoderPosDiff := ((UDINT_TO_LREAL(M7.nEncoderCount) / 150.0) - (M7.Axis.NcToPlc.SetPos - M7.stAxisParameters.fEncOffset)) * 1000;
     fbGpiPosDiffCollect(
         bExecute:=TRUE,
         pInputAdr:=ADR(fGpiEncoderPosDiff),
@@ -4257,7 +4246,7 @@ PRG_Stats
         PT:=T#15s,
     );
 
-    fMpiEncoderPosDiff := M6.nEncoderCount - (M6.Axis.NcToPlc.SetPos - M6.stAxisParameters.fEncOffset) / 0.004505;
+    fMpiEncoderPosDiff := ((UDINT_TO_LREAL(M6.nEncoderCount) * 0.004505) - (M6.Axis.NcToPlc.SetPos - M6.stAxisParameters.fEncOffset)) * 1000;
     fbMpiPosDiffCollect(
         bExecute:=TRUE,
         pInputAdr:=ADR(fMpiEncoderPosDiff),
@@ -4271,7 +4260,7 @@ PRG_Stats
         bAlwaysCalc:=TRUE,
     );
 
-    fMR1K1PiEncoderPosDiff := M16.nEncoderCount - (M16.Axis.NcToPlc.SetPos - M16.stAxisParameters.fEncOffset) / 0.00244;
+    fMR1K1PiEncoderPosDiff := ((UDINT_TO_LREAL(M16.nEncoderCount) * 0.00244) - (M16.Axis.NcToPlc.SetPos - M16.stAxisParameters.fEncOffset)) * 1000;
     fbMR1K1PiPosDiffCollect(
         bExecute:=TRUE,
         pInputAdr:=ADR(fMR1K1PiEncoderPosDiff),