Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update panda to 0.9.0 and Aravis bug fix #28

Merged
merged 4 commits into from
Aug 22, 2024
Merged

Update panda to 0.9.0 and Aravis bug fix #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39b0ebc
fix spurious space in dls-aravis ioc name
gilesknap Aug 20, 2024
a1da25b
change pvcs prefix with hack of ioc-group
gilesknap Aug 20, 2024
0b21601
added i22 plans
ZohebShaikh Aug 20, 2024
df1c2df
update panda to latest version
ZohebShaikh Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion services/bl45p-mo-panda-01/values.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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