Skip to content

Commit

Permalink
update to latest generic ioc versions
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesknap committed Jan 28, 2024
1 parent f4871dd commit f8845c1
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 22 deletions.
6 changes: 3 additions & 3 deletions iocs/bl47p-ea-dcam-01/config/bl47p-ea-dcam-01.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adaravis/releases/download/2023.11.4/ibek.ioc.schema.json
# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adaravis/releases/download/2024.1.2/ibek.ioc.schema.json

ioc_name: "{{ ioc_yaml_file_name }}"

Expand Down Expand Up @@ -47,10 +47,10 @@ entities:
R: ":ARR:"
TYPE: Int8

- type: epics.Dbpf
- type: epics.dbpf
pv: BL47P-EA-DET-01:DET:TriggerSource
value: '"Line1"'

- type: epics.Dbpf
- type: epics.dbpf
pv: BL47P-EA-DET-01:DET:GC_GevSCPSPacketSize
value: "1500"
3 changes: 1 addition & 2 deletions iocs/bl47p-ea-dcam-01/values.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# latest container image for GigE cameras from the GitHub Container Registry
image: ghcr.io/epics-containers/ioc-adaravis-linux-runtime:2023.11.4

image: ghcr.io/epics-containers/ioc-adaravis-linux-runtime:2024.1.2
10 changes: 5 additions & 5 deletions iocs/bl47p-ea-dcam-02/config/bl47p-ea-dcam-02.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adaravis/releases/download/2023.11.4/ibek.ioc.schema.json
# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adaravis/releases/download/2024.1.2/ibek.ioc.schema.json

ioc_name: "{{ ioc_yaml_file_name }}"

Expand Down Expand Up @@ -28,18 +28,18 @@ entities:
R: ":TX:"
TIMEOUT: 0

- type: epics.Dbpf
- type: epics.dbpf
pv: BL47P-EA-DET-02:DET:TriggerSource
value: '"FixedRate"'

- type: epics.Dbpf
- type: epics.dbpf
pv: BL47P-EA-DET-02:DET:GC_GevSCPSPacketSize
value: "1500"

- type: epics.Dbpf
- type: epics.dbpf
pv: BL47P-EA-DET-02:DET:ColorMode
value: '"RGB1"'

- type: epics.Dbpf
- type: epics.dbpf
pv: BL47P-EA-DET-02:DET:AcquireTime
value: "0.5"
2 changes: 1 addition & 1 deletion iocs/bl47p-ea-dcam-02/values.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# latest container image for GigE cameras from the GitHub Container Registry
image: ghcr.io/epics-containers/ioc-adaravis-linux-runtime:2023.11.4
image: ghcr.io/epics-containers/ioc-adaravis-linux-runtime:2024.1.2
2 changes: 1 addition & 1 deletion iocs/bl47p-ea-test-01/config/bl47p-ea-test-01.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adsimdetector/releases/download/2024.1.1/ibek.ioc.schema.json
# yaml-language-server: $schema=https://github.com/epics-containers/ioc-adsimdetector/releases/download/2024.1.2/ibek.ioc.schema.json
ioc_name: "{{ ioc_yaml_file_name }}"

description: Example simulated camera for BL47P
Expand Down
2 changes: 1 addition & 1 deletion iocs/bl47p-ea-test-01/values.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
image: ghcr.io/epics-containers/ioc-adsimdetector-linux-runtime:2024.1.1
image: ghcr.io/epics-containers/ioc-adsimdetector-linux-runtime:2024.1.2
14 changes: 6 additions & 8 deletions iocs/bl47p-mo-ioc-01/config/bl47p-mo-ioc-01.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
# yaml-language-server: $schema=https://github.com/epics-containers/ioc-pmac/releases/download/2024.1.1/ibek.ioc.schema.json
ioc_name: '{{ ioc_yaml_file_name }}'
# yaml-language-server: $schema=https://github.com/epics-containers/ioc-pmac/releases/download/2024.1.2/ibek.ioc.schema.json
ioc_name: "{{ ioc_yaml_file_name }}"

description: auto-generated by https://github.com/epics-containers/builder2ibek

entities:

- type: epics.EpicsCaMaxArrayBytes
max_bytes: 3000000

- type: devIocStats.iocAdminSoft
IOC: '{{ ioc_name | upper }}'
IOC: "{{ ioc_name | upper }}"

- type: pmac.pmacAsynIPPort
IP: 192.168.250.13:1025
Expand All @@ -34,7 +33,6 @@ entities:
PLC: 11
PmacController: BRICK1


- type: pmac.dls_pmac_asyn_motor
ACCL: 0.1
ADDR: 1
Expand All @@ -51,7 +49,7 @@ entities:
P: BL47P-MO-MAP-01:STAGE
PREC: 3
TWV: 1
UEIP: Yes
UEIP: "Yes"
VELO: 4

- type: pmac.dls_pmac_asyn_motor
Expand All @@ -69,7 +67,7 @@ entities:
P: BL47P-MO-MAP-01:STAGE
PREC: 3
TWV: 18
UEIP: Yes
UEIP: "Yes"
VELO: 2500

- type: pmac.CS
Expand All @@ -80,4 +78,4 @@ entities:

- type: pmac.pmacDisableLimitsCheck
Axis: 2
Controller: BRICK1
Controller: BRICK1
2 changes: 1 addition & 1 deletion iocs/bl47p-mo-ioc-01/values.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
image: ghcr.io/epics-containers/ioc-pmac-linux-runtime:2024.1.1
image: ghcr.io/epics-containers/ioc-pmac-linux-runtime:2024.1.2

0 comments on commit f8845c1

Please sign in to comment.