update dcams to released generic IOC

epics-containers · Nov 26, 2024 · 20c8eb9 · 20c8eb9
1 parent 64b3a43
commit 20c8eb9
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 31 deletions.
diff --git a/opi/p47-beamline.bob b/opi/p47-beamline.bob
@@ -282,7 +282,7 @@
     <widget type="label" version="2.0.0">
       <name>Label_6</name>
       <text>Overview Camera</text>
-      <y>10</y>
+      <y>36</y>
       <width>150</width>
       <tooltip>$(text)</tooltip>
     </widget>
@@ -301,50 +301,50 @@
       </actions>
       <text>BL47P-EA-DET-02</text>
       <x>153</x>
-      <y>10</y>
+      <y>36</y>
       <width>205</width>
       <height>20</height>
       <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_7</name>
-      <text>Sample Camera</text>
-      <y>35</y>
+      <name>Label_8</name>
+      <text>Motors</text>
+      <y>60</y>
       <width>150</width>
       <tooltip>$(text)</tooltip>
     </widget>
     <widget type="action_button" version="3.0.0">
-      <name>OpenDisplay_1</name>
+      <name>OpenDisplay_2</name>
       <actions>
         <action type="open_display">
-          <file>https://p47-opis.diamond.ac.uk/bl47p-ea-dcam-01/index.bob</file>
+          <file>https://p47-opis.diamond.ac.uk/bl47p-mo-ioc-01/index.bob</file>
           <macros>
             <P>BL47P-EA-DET-01</P>
-            <R>:TX:</R>
+            <R>:HDF5:</R>
           </macros>
           <target>tab</target>
           <description>Open Display</description>
         </action>
       </actions>
-      <text>BL47P-EA-DET-01</text>
+      <text>BL47P-MO-MAP-01</text>
       <x>153</x>
-      <y>35</y>
+      <y>60</y>
       <width>205</width>
       <height>20</height>
       <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_8</name>
-      <text>Motors</text>
-      <y>60</y>
+      <name>Label_14</name>
+      <text>Panda</text>
+      <y>85</y>
       <width>150</width>
       <tooltip>$(text)</tooltip>
     </widget>
     <widget type="action_button" version="3.0.0">
-      <name>OpenDisplay_2</name>
+      <name>OpenDisplay_3</name>
       <actions>
         <action type="open_display">
-          <file>https://p47-opis.diamond.ac.uk/bl47p-mo-ioc-01/index.bob</file>
+          <file>https://p47-opis.diamond.ac.uk/bl47p-ea-panda-01/index.bob</file>
           <macros>
             <P>BL47P-EA-DET-01</P>
             <R>:HDF5:</R>
@@ -353,36 +353,36 @@
           <description>Open Display</description>
         </action>
       </actions>
-      <text>BL47P-MO-MAP-01</text>
+      <text>BL47P-MO-PANDA-01</text>
       <x>153</x>
-      <y>60</y>
+      <y>85</y>
       <width>205</width>
       <height>20</height>
       <tooltip>$(actions)</tooltip>
     </widget>
     <widget type="label" version="2.0.0">
-      <name>Label_14</name>
-      <text>Panda</text>
-      <y>85</y>
+      <name>Label_7</name>
+      <text>Sample Camera</text>
+      <y>11</y>
       <width>150</width>
       <tooltip>$(text)</tooltip>
     </widget>
     <widget type="action_button" version="3.0.0">
-      <name>OpenDisplay_3</name>
+      <name>OpenDisplay_1</name>
       <actions>
         <action type="open_display">
-          <file>https://p47-opis.diamond.ac.uk/bl47p-ea-panda-01/index.bob</file>
+          <file>https://p47-opis.diamond.ac.uk/bl47p-ea-dcam-01/index.bob</file>
           <macros>
             <P>BL47P-EA-DET-01</P>
-            <R>:HDF5:</R>
+            <R>:TX:</R>
           </macros>
           <target>tab</target>
           <description>Open Display</description>
         </action>
       </actions>
-      <text>BL47P-MO-PANDA-01</text>
+      <text>BL47P-EA-DET-01</text>
       <x>153</x>
-      <y>85</y>
+      <y>11</y>
       <width>205</width>
       <height>20</height>
       <tooltip>$(actions)</tooltip>

diff --git a/services/bl47p-ea-dcam-01/config/ioc.yaml b/services/bl47p-ea-dcam-01/config/ioc.yaml
@@ -54,10 +54,10 @@ entities:
     R: ":ARR:"
     TYPE: Int8
 
-  - type: epics.dbpf
-    pv: BL47P-EA-DET-01:DET:TriggerSource
-    value: '"Line1"'
-
   - type: epics.dbpf
     pv: BL47P-EA-DET-01:DET:GC_GevSCPSPacketSize
     value: "1500"
+
+  - type: epics.dbpf
+    pv: BL47P-EA-DET-01:TX:EnableCallbacks
+    value: "1"
diff --git a/services/bl47p-ea-dcam-01/values.yaml b/services/bl47p-ea-dcam-01/values.yaml
@@ -1,4 +1,4 @@
 # yaml-language-server: $schema=https://github.com/epics-containers/ec-helm-charts/releases/download/3.4.4/ioc-instance.schema.json#/$defs/service
 
 ioc-instance:
-  image: ghcr.io/epics-containers/ioc-adaravis-runtime:2024.11.2b1
+  image: ghcr.io/epics-containers/ioc-adaravis-runtime:2024.11.2
diff --git a/services/bl47p-ea-dcam-02/config/ioc.yaml b/services/bl47p-ea-dcam-02/config/ioc.yaml
@@ -50,3 +50,7 @@ entities:
   - type: epics.dbpf
     pv: BL47P-EA-DET-02:DET:AcquireTime
     value: "0.5"
+
+  - type: epics.dbpf
+    pv: BL47P-EA-DET-02:TX:EnableCallbacks
+    value: "1"
diff --git a/services/bl47p-ea-dcam-02/values.yaml b/services/bl47p-ea-dcam-02/values.yaml
@@ -1,4 +1,4 @@
 # yaml-language-server: $schema=https://github.com/epics-containers/ec-helm-charts/releases/download/3.4.4/ioc-instance.schema.json#/$defs/service
 
 ioc-instance:
-  image: ghcr.io/epics-containers/ioc-adaravis-runtime:2024.11.2b1
+  image: ghcr.io/epics-containers/ioc-adaravis-runtime:2024.11.2