Auto-update from Github Actions Workflow

Deployed from commit 65bbc30 (refs/heads/master) Deployed from commit 7e0a3ba (refs/heads/master)
pcdshub · Sep 20, 2023 · e70b0a1 · e70b0a1
1 parent 7bffe63
commit e70b0a1
Show file tree

Hide file tree

Showing 11 changed files with 2,628 additions and 2,445 deletions.
diff --git a/master/_sources/lcls-plc-rixs-optics_links.rst.txt b/master/_sources/lcls-plc-rixs-optics_links.rst.txt
@@ -1236,6 +1236,9 @@ Links
         rixs_optics Instance, PlcTask Inputs^PRG_MR1K2_SWITCH.M1K2.fbRunHOMS.stXupEnc^Count, TIID^Device 1 (EtherCAT)^Term 1 (EK1200)^Term 5 (EK1122)^EK1100_M1K2^EL5042_M1K2_Xupdwn, FB Inputs Channel 1^Position
         rixs_optics Instance, PlcTask Inputs^PRG_MR1K2_SWITCH.M1K2.fbRunHOMS.stYdwnEnc^Count, TIID^Device 1 (EtherCAT)^Term 1 (EK1200)^Term 5 (EK1122)^EK1100_M1K2^EL5042_M1K2_Yleftright, FB Inputs Channel 2^Position
         rixs_optics Instance, PlcTask Inputs^PRG_MR1K2_SWITCH.M1K2.fbRunHOMS.stYupEnc^Count, TIID^Device 1 (EtherCAT)^Term 1 (EK1200)^Term 5 (EK1122)^EK1100_M1K2^EL5042_M1K2_Yleftright, FB Inputs Channel 1^Position
+        rixs_optics Instance, PlcTask Inputs^PRG_MR1K2_SWITCH.fM1K2_Flow_1.iRaw, TIID^Device 1 (EtherCAT)^Term 1 (EK1200)^Term 5 (EK1122)^EK1100_M1K2^EL3054_M1K2_FWM_PRSM, AI Standard Channel 1^Value
+        rixs_optics Instance, PlcTask Inputs^PRG_MR1K2_SWITCH.fM1K2_Flow_2.iRaw, TIID^Device 1 (EtherCAT)^Term 1 (EK1200)^Term 5 (EK1122)^EK1100_M1K2^EL3054_M1K2_FWM_PRSM, AI Standard Channel 2^Value
+        rixs_optics Instance, PlcTask Inputs^PRG_MR1K2_SWITCH.fM1K2_Press_1.iRaw, TIID^Device 1 (EtherCAT)^Term 1 (EK1200)^Term 5 (EK1122)^EK1100_M1K2^EL3054_M1K2_FWM_PRSM, AI Standard Channel 3^Value
         rixs_optics Instance, PlcTask Inputs^PRG_MR2K2_FLAT.M2K2FLATbSTOEnable1, TIID^Device 1 (EtherCAT)^Term 1 (EK1200)^Term 79 (EK1521-0010)^Term 306 (EK1501-0010)^Term 310 (EK1122)^EK1100_MR2K2^EL1004_M2K2_STO, Channel 1^Input
         rixs_optics Instance, PlcTask Inputs^PRG_MR2K2_FLAT.M2K2FLATbSTOEnable2, TIID^Device 1 (EtherCAT)^Term 1 (EK1200)^Term 79 (EK1521-0010)^Term 306 (EK1501-0010)^Term 310 (EK1122)^EK1100_MR2K2^EL1004_M2K2_STO, Channel 2^Input
         rixs_optics Instance, PlcTask Inputs^PRG_MR3K2_KBH.M3K2KBHbSTOEnable1, TIID^Device 1 (EtherCAT)^Term 1 (EK1200)^Term 79 (EK1521-0010)^Term 306 (EK1501-0010)^Term 310 (EK1122)^EK1100_MR3K2_BENDER^EL1004_M3K2_STO, Channel 1^Input

diff --git a/master/_sources/lcls-plc-rixs-optics_pragmas.rst.txt b/master/_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>`, 301, 0
+    :ref:`rixs_optics <rixs_optics_overview_pragmas>`, 307, 0
 
 
 .. _rixs_optics_overview_pragmas:
@@ -15,7 +15,7 @@ Pragmas
 rixs_optics
 ^^^^^^^^^^^
 
-Total pragmas found: 301
+Total pragmas found: 307
 Total linter errors: 0
 
 
diff --git a/master/_sources/lcls-plc-rixs-optics_rixs_optics_epics.rst.txt b/master/_sources/lcls-plc-rixs-optics_rixs_optics_epics.rst.txt
@@ -67372,6 +67372,27 @@ Database Records
         | io: input
 
 
+    * - MR1K2:SWITCH:FWM:1_RBV
+      - ai
+      - PRG_MR1K2_SWITCH.fM1K2_Flow_1_val
+      - | field: EGU lpm
+        | io: input
+
+
+    * - MR1K2:SWITCH:FWM:2_RBV
+      - ai
+      - PRG_MR1K2_SWITCH.fM1K2_Flow_2_val
+      - | field: EGU lpm
+        | io: input
+
+
+    * - MR1K2:SWITCH:PRSM:1_RBV
+      - ai
+      - PRG_MR1K2_SWITCH.fM1K2_Press_1_val
+      - | field: EGU bar
+        | io: input
+
+
     * - MR1K2:SWITCH:ENC:ROLL_RBV
       - ai
       - PRG_MR1K2_SWITCH.fYRoll_urad
@@ -73656,15 +73677,15 @@ Database Records
         | io: output
 
 
-    * - :$(PREFIX)ZOB_on_Lower_Stopper_RBV
+    * - $(PREFIX)ZOB_on_Lower_Stopper_RBV
       - bi
       - PRG_ZeroOrder_PMPS.bZOB_on_Lower_Stopper
       - | field: ONAM TRUE
         | field: ZNAM FALSE
         | io: output
 
 
-    * - :$(PREFIX)ZOB_on_Lower_Stopper
+    * - $(PREFIX)ZOB_on_Lower_Stopper
       - bo
       - PRG_ZeroOrder_PMPS.bZOB_on_Lower_Stopper
       - | field: ONAM TRUE

diff --git a/master/_sources/lcls-plc-rixs-optics_rixs_optics_source.rst.txt b/master/_sources/lcls-plc-rixs-optics_rixs_optics_source.rst.txt
@@ -2310,6 +2310,33 @@ PRG_MR1K2_SWITCH
 
         // Common
         fEncLeverArm_mm : LREAL := 391.0;
+
+    // MR1K2 Flow Press Sensors
+        {attribute 'TcLinkTo' := '.iRaw := TIIB[EL3054_M1K2_FWM_PRSM]^AI Standard Channel 1^Value'}
+        fM1K2_Flow_1 : FB_AnalogInput;
+        {attribute 'pytmc' := '
+            pv: MR1K2:SWITCH:FWM:1
+            field: EGU lpm
+            io: i
+        '}
+        fM1K2_Flow_1_val : LREAL;
+        {attribute 'TcLinkTo' := '.iRaw := TIIB[EL3054_M1K2_FWM_PRSM]^AI Standard Channel 2^Value'}
+        fM1K2_Flow_2 : FB_AnalogInput;
+        {attribute 'pytmc' := '
+            pv: MR1K2:SWITCH:FWM:2
+            field: EGU lpm
+            io: i
+        '}
+        fM1K2_Flow_2_val : LREAL;
+        {attribute 'TcLinkTo' := '.iRaw := TIIB[EL3054_M1K2_FWM_PRSM]^AI Standard Channel 3^Value'}
+        fM1K2_Press_1 : FB_AnalogInput;
+        {attribute 'pytmc' := '
+            pv: MR1K2:SWITCH:PRSM:1
+            field: EGU bar
+            io: i
+        '}
+        fM1K2_Press_1_val : LREAL;
+
     END_VAR
     // M1K2
     M1K2.fbRunHOMS(stYup:=M1,
@@ -2394,6 +2421,15 @@ PRG_MR1K2_SWITCH
 
     nEncRefPitchM1K2 := LREAL_TO_UDINT(ABS(fEncRefPitchM1K2_urad) * fEncLeverArm_mm);
 
+    //FLOW AND PRESSURE SENSOR
+    // MR1K2 Flow Pressure Sensors
+    fM1K2_Flow_1(iTermBits:=15, fTermMax:=5.0427, fTermMin:=0.050472);
+    fM1K2_Flow_1_val := fM1K2_Flow_1.fReal;
+    fM1K2_Flow_2(iTermBits:=15, fTermMax:=5.0427, fTermMin:=0.050472);
+    fM1K2_Flow_2_val := fM1K2_Flow_2.fReal;
+    fM1K2_Press_1(iTermBits:=15, fTermMax:=4.0, fTermMin:=0);
+    fM1K2_Press_1_val := fM1K2_Press_1.fReal;
+
     END_PROGRAM
 
 
@@ -3549,13 +3585,13 @@ PRG_SP1K1_MONO
         i_xAutoReset :=TRUE,
         io_fbFFHWO := GVL_PMPS.fbFastFaultOutput1);
 
-    fSP1K1_Flow_1(iTermBits:=12, fTermMax:=5.0427, fTermMin:=0.050472);
+    fSP1K1_Flow_1(iTermBits:=15, fTermMax:=5.0427, fTermMin:=0.050472);
     fSP1K1_Flow_1_val := fSP1K1_Flow_1.fReal;
 
-    fSP1K1_Flow_2(iTermBits:=12, fTermMax:=5.0427, fTermMin:=0.050472);
+    fSP1K1_Flow_2(iTermBits:=15, fTermMax:=5.0427, fTermMin:=0.050472);
     fSP1K1_Flow_2_val := fSP1K1_Flow_2.fReal;
 
-    fSP1K1_Press_1(iTermBits:=12, fTermMax:=4.0, fTermMin:=0);
+    fSP1K1_Press_1(iTermBits:=15, fTermMax:=4.0, fTermMin:=0);
     fSP1K1_Press_1_val := fSP1K1_Press_1.fReal;
 
     END_PROGRAM
@@ -3729,7 +3765,7 @@ PRG_ZeroOrder_PMPS
         bZOS_IN : BOOL;
 
         {attribute 'pytmc' := '
-            pv: :@(PREFIX)ZOB_on_Lower_Stopper
+            pv: @(PREFIX)ZOB_on_Lower_Stopper
             field: ZNAM FALSE
             field: ONAM TRUE
         '}