Skip to content

Commit

Permalink
update dcam generic IOC version
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Nov 25, 2024
1 parent 728e027 commit a9e6e4f
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
26 changes: 13 additions & 13 deletions opi/training-beamline.bob
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<name>X Stage</name>
<macros>
<M>STAGE:X</M>
<P>bl46p-MO-MAP-01:</P>
<P>BL46P-MO-MAP-01:</P>
</macros>
<x>5</x>
<y>30</y>
Expand Down Expand Up @@ -150,7 +150,7 @@
<name>Rotation Stage</name>
<macros>
<M>STAGE:A</M>
<P>bl46p-MO-MAP-01:</P>
<P>BL46P-MO-MAP-01:</P>
</macros>
<x>5</x>
<y>204</y>
Expand Down Expand Up @@ -272,7 +272,7 @@
<name>Auto Generated Engineering Screens</name>
<macros>
<M>STAGE:A</M>
<P>bl46p-MO-MAP-01:</P>
<P>BL46P-MO-MAP-01:</P>
</macros>
<x>5</x>
<y>850</y>
Expand All @@ -292,14 +292,14 @@
<action type="open_display">
<file>https://p46-opis.diamond.ac.uk/bl46p-ea-dcam-02/index.bob</file>
<macros>
<P>bl46p-EA-DET-01</P>
<P>BL46P-EA-DET-01</P>
<R>:DET:</R>
</macros>
<target>tab</target>
<description>Open Display</description>
</action>
</actions>
<text>bl46p-EA-DET-02</text>
<text>BL46P-EA-DET-02</text>
<x>153</x>
<y>10</y>
<width>205</width>
Expand All @@ -319,14 +319,14 @@
<action type="open_display">
<file>https://p46-opis.diamond.ac.uk/bl46p-ea-dcam-01/index.bob</file>
<macros>
<P>bl46p-EA-DET-01</P>
<P>BL46P-EA-DET-01</P>
<R>:TX:</R>
</macros>
<target>tab</target>
<description>Open Display</description>
</action>
</actions>
<text>bl46p-EA-DET-01</text>
<text>BL46P-EA-DET-01</text>
<x>153</x>
<y>35</y>
<width>205</width>
Expand All @@ -346,7 +346,7 @@
<action type="open_display">
<file>https://p46-opis.diamond.ac.uk/bl46p-mo-ioc-01/index.bob</file>
<macros>
<P>bl46p-EA-DET-01</P>
<P>BL46P-EA-DET-01</P>
<R>:HDF5:</R>
</macros>
<target>tab</target>
Expand All @@ -373,7 +373,7 @@
<action type="open_display">
<file>https://p46-opis.diamond.ac.uk/bl46p-ea-panda-01/index.bob</file>
<macros>
<P>bl46p-EA-DET-01</P>
<P>BL46P-EA-DET-01</P>
<R>:HDF5:</R>
</macros>
<target>tab</target>
Expand All @@ -391,7 +391,7 @@
<widget type="group" version="2.0.0">
<name>Sample Camera</name>
<macros>
<P>bl46p-EA-DET-01</P>
<P>BL46P-EA-DET-01</P>
<R>:DET:</R>
</macros>
<x>5</x>
Expand Down Expand Up @@ -719,7 +719,7 @@
</widget>
<widget type="image" version="2.0.0">
<name>Image</name>
<pv_name>pva://bl46p-EA-DET-01:TX:PVA</pv_name>
<pv_name>pva://BL46P-EA-DET-01:TX:PVA</pv_name>
<x>408</x>
<y>36</y>
<width>828</width>
Expand Down Expand Up @@ -758,7 +758,7 @@
</widget>
<widget type="image" version="2.0.0">
<name>Image_1</name>
<pv_name>pva://bl46p-EA-DET-02:TX:PVA</pv_name>
<pv_name>pva://BL46P-EA-DET-02:TX:PVA</pv_name>
<x>480</x>
<y>580</y>
<width>688</width>
Expand Down Expand Up @@ -800,7 +800,7 @@
<widget type="group" version="2.0.0">
<name>Overview Camera</name>
<macros>
<P>bl46p-EA-DET-02</P>
<P>BL46P-EA-DET-02</P>
<R>:DET:</R>
</macros>
<x>5</x>
Expand Down
2 changes: 1 addition & 1 deletion services/bl46p-ea-dcam-01/values.yaml
Original file line number Diff line number Diff line change
@@ -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.9.1
image: ghcr.io/epics-containers/ioc-adaravis-runtime:2024.11.2
2 changes: 1 addition & 1 deletion services/bl46p-ea-dcam-02/values.yaml
Original file line number Diff line number Diff line change
@@ -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.9.1
image: ghcr.io/epics-containers/ioc-adaravis-runtime:2024.11.2

0 comments on commit a9e6e4f

Please sign in to comment.