Skip to content

Commit

Permalink
Update panda to 0.9.0 and Aravis bug fix (#28)
Browse files Browse the repository at this point in the history
* fix spurious space in dls-aravis ioc name

* change pvcs prefix with hack of ioc-group

* added i22 plans

* update panda to latest version

---------

Co-authored-by: Giles Knap <giles.knap@diamond.ac.uk>
  • Loading branch information
ZohebShaikh and gilesknap authored Aug 22, 2024
1 parent bf57cc8 commit 8abb551
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion services/bl45p-mo-panda-01/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# latest container image for GigE cameras from the GitHub Container Registry
ioc-instance:
image: ghcr.io/pandablocks/pandablocks-ioc:0.7.1
image: ghcr.io/pandablocks/pandablocks-ioc:0.9.0

# this causes our config folder's start.sh to be mounted over the default
# /epics/ioc/start.sh - thus making the pandaBlocks container image have
Expand Down
2 changes: 1 addition & 1 deletion services/bl45p-mo-panda-02/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# latest container image for GigE cameras from the GitHub Container Registry
ioc-instance:
image: ghcr.io/pandablocks/pandablocks-ioc:0.7.1
image: ghcr.io/pandablocks/pandablocks-ioc:0.9.0

# this causes our config folder's start.sh to be mounted over the default
# /epics/ioc/start.sh - thus making the pandaBlocks container image have
Expand Down
2 changes: 2 additions & 0 deletions services/daq-blueapi/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ blueapi:
sources:
- kind: dodal
module: dodal.beamlines.p45
- kind: planFunctions
module: i22_bluesky.plans
# TODO: Make p45 plans repository
- kind: planFunctions
module: dls_bluesky_core.plans
Expand Down
5 changes: 3 additions & 2 deletions services/dls-aravis/config/ioc.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adaravis/releases/download/2024.1.2/ibek.ioc.schema.json

ioc_name: " [[ _global.get_env('IOC_NAME') ]]"
ioc_name: "[[ _global.get_env('IOC_NAME') ]]"

description: auto-generated by https://github.com/epics-containers/builder2ibek
description: shared template for all Aravis cameras on p45

entities:
- type: epics.EpicsCaMaxArrayBytes
Expand All @@ -14,6 +14,7 @@ entities:

- type: devIocStats.iocAdminSoft
IOC: "[[ ioc_name | upper ]]"

- type: ADAravis.aravisCamera
CLASS: {{ .Values.CLASS}}
ID: {{ .Values.ID }}
Expand Down

0 comments on commit 8abb551

Please sign in to comment.