Merge branch 'pcdshub:master' into daff

pcdshub · Dec 11, 2024 · 7e7a9b0 · 7e7a9b0
2 parents 9ee806f + 42837d6
commit 7e7a9b0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Spreadsheet/LCLS/FMS-alarms.csv b/Spreadsheet/LCLS/FMS-alarms.csv
@@ -3,12 +3,12 @@
 1,MEC,,,,,,
 2,Racks,,,,,,
 ,,MEC:FMS:R64A:HMD,Rack Humidity,,,,
-,,MEC:FMS:R64B:HMD,Rack Humidity,,,,
+,,MEC:FMS:R64B:HMD:SVAL_RBV,Rack Humidity,,,,
 ,,MEC:FMS:R60:HMD,Rack Humidity,,,,
 ,,MEC:FMS:R61:HMD,Rack Humidity,,,,
 ,,MEC:FMS:R62:HMD,Rack Humidity,,,,
-,,MEC:FMS:R64A:TEMP,Rack Temperature,,,,
-,,MEC:FMS:R64B:TEMP,Rack Temperature,,,,
+,,MEC:FMS:R64A:TEMP:SVAL_RBV,Rack Temperature,,,,
+,,MEC:FMS:R64B:TEMP:SVAL_RBV,Rack Temperature,,,,
 ,,MEC:FMS:R60:TEMP,Rack Temperature,,,,
 ,,MEC:FMS:R61:TEMP,Rack Temperature,,,,
 ,,MEC:FMS:R62:TEMP,Rack Temperature,,,,
@@ -31,6 +31,6 @@
 ,,MEC:FMS:SE:PCW:FWM:RET,PCW Flow Return,,,,
 2,Laser,,,,,,
 ,,MEC:FMS:VISAR:TEMP,Visar Temperature,,,,
-,,MEC:FMS:LAS:GLS:INT:TEMP,Glass Rod Int Temperature,,,,
+,,MEC:FMS:LAS:GLS:INT:TEMP:SVAL_RBV,Glass Rod Int Temperature,,,,
 ,,MEC:FMS:LAS:GLS:EXT:TEMP,Glass Rod Ext Temperature,,,,
 ,,MEC:FMS:YFE:TEMP,YFE Temperature,,,,
diff --git a/XML/LCLS/FMS-alarms.xml b/XML/LCLS/FMS-alarms.xml
@@ -8,7 +8,7 @@
                <latching/>
                <delay/>
             </pv>
-            <pv name="MEC:FMS:R64B:HMD">
+            <pv name="MEC:FMS:R64B:HMD:SVAL_RBV">
                <description>Rack Humidity</description>
                <latching/>
                <delay/>
@@ -28,12 +28,12 @@
                <latching/>
                <delay/>
             </pv>
-            <pv name="MEC:FMS:R64A:TEMP">
+            <pv name="MEC:FMS:R64A:TEMP:SVAL_RBV">
                <description>Rack Temperature</description>
                <latching/>
                <delay/>
             </pv>
-            <pv name="MEC:FMS:R64B:TEMP">
+            <pv name="MEC:FMS:R64B:TEMP:SVAL_RBV">
                <description>Rack Temperature</description>
                <latching/>
                <delay/>
@@ -139,7 +139,7 @@
                <latching/>
                <delay/>
             </pv>
-            <pv name="MEC:FMS:LAS:GLS:INT:TEMP">
+            <pv name="MEC:FMS:LAS:GLS:INT:TEMP:SVAL_RBV">
                <description>Glass Rod Int Temperature</description>
                <latching/>
                <delay/>