Merge branch 'master' into 'master'

Added resistance reading for CABTR opi

See merge request ics-software/ess-opis!167

NON-APPROVED/TS2/ts2-cryomodule/cabtr/cabtr_te.bob

@@ -457,4 +457,21 @@
     <horizontal_alignment>2</horizontal_alignment>
     <vertical_alignment>1</vertical_alignment>
   </widget>
+  <widget type="label" version="2.0.0">
+    <name>Resistance</name>
+    <text>Resistance:</text>
+    <x>484</x>
+    <y>196</y>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
+  <widget type="textupdate" version="2.0.0">
+    <name>ResisR</name>
+    <pv_name>$(DEVICE):ResisR</pv_name>
+    <x>590</x>
+    <y>196</y>
+    <width>105</width>
+    <horizontal_alignment>2</horizontal_alignment>
+    <vertical_alignment>1</vertical_alignment>
+  </widget>
 </display>